From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 12 Nov 2013 14:39:34 +0000 (+0000)
Subject: Merge "Make 'quotation-marks' message non-optional"
X-Git-Tag: 1.31.0-rc.0~18185
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=55d5f04e56c1fdddd13073b2749d50778d1e3770;hp=d5aac9f6e001dfe11f3b6e67bb7cb24dbbb224ff;p=lhc%2Fweb%2Fwiklou.git

Merge "Make 'quotation-marks' message non-optional"
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 493194462a..1cc20b9761 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4652,7 +4652,7 @@ Please confirm that you really want to recreate this page.",
 'percent'             => '$1%', # only translate this message to other languages if you have to change it
 'parentheses'         => '($1)', # only translate this message to other languages if you have to change it
 'brackets'            => '[$1]', # only translate this message to other languages if you have to change it
-'quotation-marks'     => '"$1"', # only translate this message to other languages if you have to change it
+'quotation-marks'     => '"$1"',
 
 # Multipage image navigation
 'imgmultipageprev' => '← previous page',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index b42e5af82c..f6e2f6d2b3 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -9559,7 +9559,9 @@ Most languages use a space, but some Asian languages, such as Thai and Chinese,
 'percent' => '{{optional}}',
 'parentheses' => '{{optional}}',
 'brackets' => '{{Optional}}',
-'quotation-marks' => '{{optional}}',
+'quotation-marks' => 'Quotation marks, for citing, sometimes titles etc., depending on the language.
+
+See: https://en.wikipedia.org/wiki/Non-English_usage_of_quotation_marks',
 
 # Multipage image navigation
 'imgmultipageprev' => '{{Identical|Previous page}}',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 4e9ce4064f..267666d38b 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -456,7 +456,6 @@ $wgOptionalMessages = array(
 	'percent',
 	'parentheses',
 	'brackets',
-	'quotation-marks',
 	'listgrouprights-right-display',
 	'listgrouprights-right-revoked',
 	'timezone-utc',