X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=languages%2Fi18n%2Fen.json;h=ded741d7960ca768f627ccd85ffca16f511f6bb9;hp=168ce075cc3a2e2fb672758197499fb78cc8e7bc;hb=0e339243f1dbbba5f87a54b116c23e0daec8e2e4;hpb=19067a0c91bae06a2550118af35a343b38c61076

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 168ce075cc..ded741d796 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2,7 +2,7 @@
 	"@metadata": {
 		"authors": []
 	},
-	"sidebar": "\n* navigation\n** mainpage|mainpage-description\n** recentchanges-url|recentchanges\n** randompage-url|randompage\n** helppage|help\n* SEARCH\n* TOOLBOX\n* LANGUAGES",
+	"sidebar": "\n* navigation\n** mainpage|mainpage-description\n** recentchanges-url|recentchanges\n** randompage-url|randompage\n** helppage|help-mediawiki\n* SEARCH\n* TOOLBOX\n* LANGUAGES",
 	"tog-underline": "Link underlining:",
 	"tog-hideminor": "Hide minor edits from recent changes",
 	"tog-hidepatrolled": "Hide patrolled edits from recent changes",
@@ -160,6 +160,7 @@
 	"returnto": "Return to $1.",
 	"tagline": "From {{SITENAME}}",
 	"help": "Help",
+	"help-mediawiki": "Help about MediaWiki",
 	"search": "Search",
 	"search-ignored-headings": " #<!-- leave this line exactly as it is --> <pre>\n# Headings that will be ignored by search.\n# Changes to this take effect as soon as the page with the heading is indexed.\n# You can force page reindexing by doing a null edit.\n# The syntax is as follows:\n#   * Everything from a \"#\" character to the end of the line is a comment.\n#   * Every non-blank line is the exact title to ignore, case and everything.\nReferences\nExternal links\nSee also\n #</pre> <!-- leave this line exactly as it is -->",
 	"searchbutton": "Search",
@@ -373,6 +374,7 @@
 	"ns-specialprotected": "Special pages cannot be edited.",
 	"titleprotected": "This title has been protected from creation by [[User:$1|$1]].\nThe reason given is <em>$2</em>.",
 	"filereadonlyerror": "Unable to modify the file \"$1\" because the file repository \"$2\" is in read-only mode.\n\nThe system administrator who locked it offered this explanation: \"$3\".",
+	"invalidtitle": "Invalid title",
 	"invalidtitle-knownnamespace": "Invalid title with namespace \"$2\" and text \"$3\"",
 	"invalidtitle-unknownnamespace": "Invalid title with unknown namespace number $1 and text \"$2\"",
 	"exception-nologin": "Not logged in",
@@ -537,6 +539,7 @@
 	"botpasswords-existing": "Existing bot passwords",
 	"botpasswords-createnew": "Create a new bot password",
 	"botpasswords-editexisting": "Edit an existing bot password",
+	"botpasswords-label-needsreset": "(password needs reset)",
 	"botpasswords-label-appid": "Bot name:",
 	"botpasswords-label-create": "Create",
 	"botpasswords-label-update": "Update",
@@ -560,6 +563,8 @@
 	"botpasswords-restriction-failed": "Bot password restrictions prevent this login.",
 	"botpasswords-invalid-name": "The username specified does not contain the bot password separator (\"$1\").",
 	"botpasswords-not-exist": "User \"$1\" does not have a bot password named \"$2\".",
+	"botpasswords-needs-reset": "The bot password for bot name \"$2\" of {{GENDER:$1|user}} \"$1\" must be reset.",
+	"botpasswords-locked": "You cannot login with a bot password as your account is locked.",
 	"resetpass_forbidden": "Passwords cannot be changed",
 	"resetpass_forbidden-reason": "Passwords cannot be changed: $1",
 	"resetpass-no-info": "You must be logged in to access this page directly.",
@@ -4026,9 +4031,6 @@
 	"dberr-again": "Try waiting a few minutes and reloading.",
 	"dberr-info": "(Cannot access the database: $1)",
 	"dberr-info-hidden": "(Cannot access the database)",
-	"dberr-usegoogle": "You can try searching via Google in the meantime.",
-	"dberr-outofdate": "Note that their indexes of our content may be out of date.",
-	"dberr-cachederror": "This is a cached copy of the requested page, and may not be up to date.",
 	"htmlform-invalid-input": "There are problems with some of your input.",
 	"htmlform-select-badoption": "The value you specified is not a valid option.",
 	"htmlform-int-invalid": "The value you specified is not an integer.",
@@ -4464,5 +4466,7 @@
 	"pagedata-title": "Page data",
 	"pagedata-text": "This page provides a data interface to pages. Please provide the page title in the URL, using subpage syntax.\n* Content negotiation applies based on your client's Accept header. This means that the page data will be provided in the format preferred by your client.",
 	"pagedata-not-acceptable": "No matching format found. Supported MIME types: $1",
-	"pagedata-bad-title": "Invalid title: $1."
+	"pagedata-bad-title": "Invalid title: $1.",
+	"unregistered-user-config": "For security reasons JavaScript, CSS and JSON user subpages cannot be loaded for unregistered users.",
+	"unprotected-js": "For security reasons JavaScript cannot be loaded from unprotected pages. Please only create javascript in the MediaWiki: namespace or as a User subpage"
 }