Merge "Add config for serving main Page from the domain root"

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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index f6ea46c..7944a37 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -47,6 +47,7 @@
        "tog-useeditwarning": "Warn me when I leave an edit page with unsaved changes",
        "tog-prefershttps": "Always use a secure connection while logged in",
        "tog-showrollbackconfirmation": "Show a confirmation prompt when clicking on a rollback link",
+       "tog-requireemail": "Require email for password resets",
        "underline-always": "Always",
        "underline-never": "Never",
        "underline-default": "Skin or browser default",
@@ -441,7 +442,7 @@
        "createaccountmail": "Use a temporary random password and send it to the specified email address",
        "createaccountmail-help": "Can be used to create account for another person without learning the password.",
        "createacct-realname": "Real name (optional)",
-       "createacct-reason": "Reason",
+       "createacct-reason": "Reason (publicly logged)",
        "createacct-reason-ph": "Why you are creating another account",
        "createacct-reason-help": "Message shown in the account creation log",
        "createacct-imgcaptcha-help": "",
@@ -627,25 +628,7 @@
        "resettokens-watchlist-token": "Token for the web feed (Atom/RSS) of [[Special:Watchlist|changes to pages on your watchlist]]",
        "resettokens-done": "Tokens reset.",
        "resettokens-resetbutton": "Reset selected tokens",
-       "bold_sample": "Bold text",
-       "bold_tip": "Bold text",
-       "italic_sample": "Italic text",
-       "italic_tip": "Italic text",
-       "link_sample": "Link title",
-       "link_tip": "Internal link",
-       "extlink_sample": "http://www.example.com link title",
-       "extlink_tip": "External link (remember http:// prefix)",
-       "headline_sample": "Headline text",
-       "headline_tip": "Level 2 headline",
-       "nowiki_sample": "Insert non-formatted text here",
-       "nowiki_tip": "Ignore wiki formatting",
-       "image_sample": "Example.jpg",
-       "image_tip": "Embedded file",
-       "media_sample": "Example.ogg",
-       "media_tip": "File link",
        "sig-text": "--$1",
-       "sig_tip": "Your signature with timestamp",
-       "hr_tip": "Horizontal line (use sparingly)",
        "summary": "Summary:",
        "subject": "Subject:",
        "minoredit": "This is a minor edit",
@@ -1152,6 +1135,7 @@
        "prefs-help-email": "Email address is optional, but is needed for password resets, should you forget your password.",
        "prefs-help-email-others": "You can also choose to let others contact you by email through a link on your user or talk page.\nYour email address is not revealed when other users contact you.",
        "prefs-help-email-required": "Email address is required.",
+       "prefs-help-requireemail": "If checked, will only send password reset emails if the resetting person has provided both username and email for this account.",
        "prefs-info": "Basic information",
        "prefs-i18n": "Internationalisation",
        "prefs-signature": "Signature",
@@ -1891,6 +1875,7 @@
        "listfiles-userdoesnotexist": "User account \"$1\" is not registered.",
        "imgfile": "file",
        "listfiles": "File list",
+       "listfiles_subpage": "Uploads by $1",
        "listfiles_thumb": "Thumbnail",
        "listfiles_date": "Date",
        "listfiles_name": "Name",
@@ -2694,6 +2679,7 @@
        "ipblocklist-legend": "Find a blocked user",
        "blocklist-userblocks": "Hide account blocks",
        "blocklist-tempblocks": "Hide temporary blocks",
+       "blocklist-indefblocks": "Hide indefinite blocks",
        "blocklist-addressblocks": "Hide single IP blocks",
        "blocklist-type": "Type:",
        "blocklist-type-opt-all": "All",
@@ -4259,5 +4245,8 @@
        "mycustomjsredirectprotected": "You do not have permission to edit this JavaScript page because it is a redirect and it does not point inside your userspace.",
        "easydeflate-invaliddeflate": "Content provided is not properly deflated",
        "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",
-       "userlogout-continue": "Do you want to log out?"
+       "userlogout-continue": "Do you want to log out?",
+       "rest-prefix-mismatch": "The requested path ($1) was not inside the REST API root path ($2)",
+       "rest-wrong-method": "The request method ($1) was not {{PLURAL:$3|the allowed method for this path|one of the allowed methods for this path}} ($2)",
+       "rest-no-match": "The requested relative path ($1) did not match any known handler"
 }