From: Alexandre Emsenhuber Date: Mon, 24 Mar 2008 19:05:06 +0000 (+0000) Subject: Fix for r32378: added new messages to messages.inc and rebuilt MessagesEn.php X-Git-Tag: 1.31.0-rc.0~48843 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=e916197ef4858307c99ce6e2172ba0f2cbf8dbba;p=lhc%2Fweb%2Fwiklou.git 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 61779624a2..b69119acb3 100644 --- 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 73b66ae867..a1f1f10db3 100644 --- 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',