From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 19 Dec 2018 12:30:23 +0000 (+0000)
Subject: Merge "i18n: Clarify the default sidebar 'Help' link is about MediaWiki itself" into... 
X-Git-Tag: 1.31.2~48
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=3cb7085490ac5ffde5c1ecaaf166847bbfb16813;hp=5a4eb3dd50a885507fd8be330d58e8a2641632fe;p=lhc%2Fweb%2Fwiklou.git

Merge "i18n: Clarify the default sidebar 'Help' link is about MediaWiki itself" into REL1_31
---

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 9bb431a534..7ebdd5bcc1 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",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 1b050ace36..0067c8f80f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -356,7 +356,8 @@
 	"errorpagetitle": "Message shown in browser title bar when encountering error operation.\n\n{{Identical|Error}}",
 	"returnto": "{{Identical|Return to $1}}",
 	"tagline": "{{doc-important|Do not change <code><nowiki>{{SITENAME}}</nowiki></code>.}}\nUsed to identify the source of copied information.",
-	"help": "General text (noun) used in the sidebar (by default).\n\nSee also {{msg-mw|Helppage}} and {{msg-mw|Edithelp}}.\n\nSee also:\n* {{msg-mw|Help}}\n* {{msg-mw|Accesskey-n-help}}\n* {{msg-mw|Tooltip-n-help}}\n{{Identical|Help}}",
+	"help": "General text (noun).\n\nSee also {{msg-mw|Helppage}} and {{msg-mw|Edithelp}}.\n\nSee also:\n* {{msg-mw|Help}}\n* {{msg-mw|Accesskey-n-help}}\n* {{msg-mw|Tooltip-n-help}}\n{{Identical|Help}}",
+	"help-mediawiki": "Text ('Help' is a noun) used in the sidebar (by default) to link to the MediaWiki help on mediawiki.org.",
 	"search": "{{doc-special|Search}}\nNoun. Text of menu section shown on every page of the wiki above the search form.\n\nSee also:\n* {{msg-mw|Search}}\n* {{msg-mw|Accesskey-search}}\n* {{msg-mw|Tooltip-search}}\n{{Identical|Search}}",
 	"search-ignored-headings": "Headings that will be ignored by search. You can translate the text, including \"Leave this line exactly as it is\". Some lines of this messages have one (1) leading space.",
 	"searchbutton": "The button you can see in the sidebar, below the search input box. The \"Go\" button is {{msg-mw|Searcharticle}}.\n{{Identical|Search}}",