Merge "Add top help link to MediaWiki.org in several pages via indicator"

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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 96e3e3e..a81a89e 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -234,6 +234,7 @@
        "edithelp": "Editing help",
        "edithelppage": "https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Editing_pages",
        "helppage": "https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents",
+       "helppage-top-gethelp": "Help",
        "mainpage": "Main Page",
        "mainpage-description": "Main page",
        "policy-url": "Project:Policy",
@@ -322,6 +323,7 @@
        "readonly_lag": "The database has been automatically locked while the slave database servers catch up to the master",
        "internalerror": "Internal error",
        "internalerror_info": "Internal error: $1",
+       "internalerror-fatal-exception": "Fatal exception of type \"$1\"",
        "filecopyerror": "Could not copy file \"$1\" to \"$2\".",
        "filerenameerror": "Could not rename file \"$1\" to \"$2\".",
        "filedeleteerror": "Could not delete file \"$1\".",
@@ -3518,19 +3520,28 @@
        "newuserlog-autocreate-entry": "Account created automatically",
        "rightslogentry": "changed group membership for $1 from $2 to $3",
        "rightslogentry-autopromote": "was automatically promoted from $2 to $3",
+       "feedback-adding": "Adding feedback to page...",
+       "feedback-back": "Back",
+       "feedback-bugcheck": "Great! Just check that it is not already one of the [$1 known bugs].",
+       "feedback-bugnew": "I checked. Report a new bug",
        "feedback-bugornote": "If you are ready to describe a technical problem in detail please [$1 report a bug].\nOtherwise, you can use the easy form below. Your comment will be added to the page \"[$3 $2]\", along with your username.",
-       "feedback-subject": "Subject:",
-       "feedback-message": "Message:",
        "feedback-cancel": "Cancel",
-       "feedback-submit": "Submit Feedback",
-       "feedback-adding": "Adding feedback to page...",
+       "feedback-close": "Done",
+       "feedback-external-bug-report-button": "File a technical task",
+       "feedback-dialog-title": "Submit feedback",
+       "feedback-dialog-intro": "You can use the easy form below to submit your feedback. Your comment will be added to the page \"$1\", along with your username.",
+       "feedback-error-title": "Error",
        "feedback-error1": "Error: Unrecognized result from API",
        "feedback-error2": "Error: Edit failed",
        "feedback-error3": "Error: No response from API",
+       "feedback-message": "Message:",
+       "feedback-subject": "Subject:",
+       "feedback-submit": "Submit",
+       "feedback-terms": "I understand that my user agent information includes information about my exact browser and operating system version and will be shared publicly alongside my feedback.",
+       "feedback-termsofuse": "I agree to provide feedback in accordance with the Terms of Use.",
        "feedback-thanks": "Thanks! Your feedback has been posted to the page \"[$2 $1]\".",
-       "feedback-close": "Done",
-       "feedback-bugcheck": "Great! Just check that it is not already one of the [$1 known bugs].",
-       "feedback-bugnew": "I checked. Report a new bug",
+       "feedback-thanks-title": "Thank you!",
+       "feedback-useragent": "User agent:",
        "searchsuggest-search": "Search",
        "searchsuggest-containing": "containing...",
        "api-error-badaccess-groups": "You are not permitted to upload files to this wiki.",