Merge "Make 'quotation-marks' message non-optional (again)"

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e8c4dd7..aecd24e 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4661,7 +4661,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/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 46b0362..142727c 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -498,7 +498,6 @@ $wgOptionalMessages = array(
        'limitreport-expensivefunctioncount-value',
        'interlanguage-link-title',
        'img-lang-opt',
-       'quotation-marks',
        'recentchanges-legend-plusminus',
 );