Merge "API: HTMLize and internationalize the help, add Special:ApiHelp"

[lhc/web/wiklou.git] / languages / i18n / en.json

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 872eea0..c3140c7 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -463,11 +463,8 @@
        "blocked-mailpassword": "Your IP address is blocked from editing, and so is not allowed to use the password recovery function to prevent abuse.",
        "eauthentsent": "A confirmation email has been sent to the specified email address.\nBefore any other email is sent to the account, you will have to follow the instructions in the email, to confirm that the account is actually yours.",
        "throttled-mailpassword": "A password reset email has already been sent, within the last {{PLURAL:$1|hour|$1 hours}}.\nTo prevent abuse, only one password reset email will be sent per {{PLURAL:$1|hour|$1 hours}}.",
-       "loginstart": "",
-       "loginend": "",
-       "loginend-https": "",
-       "signupstart": "{{int:loginstart}}",
-       "signupend": "{{int:loginend}}",
+       "signupstart": "",
+       "signupend": "",
        "signupend-https": "",
        "mailerror": "Error sending mail: $1",
        "acct_creation_throttle_hit": "Visitors to this wiki using your IP address have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the maximum allowed in this time period.\nAs a result, visitors using this IP address cannot create any more accounts at the moment.",
@@ -1835,7 +1832,7 @@
        "wlheader-enotif": "Email notification is enabled.",
        "wlheader-showupdated": "Pages that have been changed since you last visited them are shown in <strong>bold</strong>.",
        "wlnote": "Below {{PLURAL:$1|is the last change|are the last <strong>$1</strong> changes}} in the last {{PLURAL:$2|hour|<strong>$2</strong> hours}}, as of $3, $4.",
-       "wlshowlast": "Show last $1 hours $2 days $3",
+       "wlshowlast": "Show last $1 hours $2 days",
        "watchlist-options": "Watchlist options",
        "watching": "Watching...",
        "unwatching": "Unwatching...",
@@ -3057,7 +3054,6 @@
        "exif-urgency-low": "Low ($1)",
        "exif-urgency-high": "High ($1)",
        "exif-urgency-other": "User-defined priority ($1)",
-       "watchlistall2": "all",
        "namespacesall": "all",
        "monthsall": "all",
        "confirmemail": "Confirm email address",
@@ -3565,5 +3561,15 @@
        "mediastatistics-header-office": "Office",
        "mediastatistics-header-text": "Textual",
        "mediastatistics-header-executable": "Executables",
-       "mediastatistics-header-archive": "Compressed formats"
+       "mediastatistics-header-archive": "Compressed formats",
+       "json-warn-trailing-comma": "$1 trailing {{PLURAL:$1|comma was|commas were}} removed from JSON",
+       "json-error-unknown": "There was a problem with the JSON. Error: $1",
+       "json-error-depth": "The maximum stack depth has been exceeded",
+       "json-error-state-mismatch": "Invalid or malformed JSON",
+       "json-error-ctrl-char": "Control character error, possibly incorrectly encoded",
+       "json-error-syntax": "Syntax error",
+       "json-error-utf8": "Malformed UTF-8 characters, possibly incorrectly encoded",
+       "json-error-recursion": "One or more recursive references in the value to be encoded",
+       "json-error-inf-or-nan": "One or more NAN or INF values in the value to be encoded",
+       "json-error-unsupported-type": "A value of a type that cannot be encoded was given"
 }