Fix for r32378: added new messages to messages.inc and rebuilt MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 6177962..b69119a 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1183,8 +1183,8 @@ Other admins on {{SITENAME}} will still be able to access the hidden content and
 
 # History merging
 'mergehistory'                     => 'Merge page histories',
-'mergehistory-header'              => "This page lets you merge revisions of the history of one source page into a newer page.
-Make sure that this change will maintain historical page continuity.",
+'mergehistory-header'              => 'This page lets you merge revisions of the history of one source page into a newer page.
+Make sure that this change will maintain historical page continuity.',
 'mergehistory-box'                 => 'Merge revisions of two pages:',
 'mergehistory-from'                => 'Source page:',
 'mergehistory-into'                => 'Destination page:',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 73b66ae..a1f1f10 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -650,6 +650,8 @@ $wgMessageStructure = array(
                'mergehistory-no-destination',
                'mergehistory-invalid-source',
                'mergehistory-invalid-destination',
+               'mergehistory-autocomment',
+               'mergehistory-comment',
        ),
        'mergelog' => array(
                'mergelog',