Add mergehistory-reason, missing from r48159
authorAaron Schulz <aaron@users.mediawiki.org>
Sun, 8 Mar 2009 20:13:29 +0000 (20:13 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Sun, 8 Mar 2009 20:13:29 +0000 (20:13 +0000)
languages/messages/MessagesEn.php
maintenance/language/messages.inc

index a1f84dd..7b687f4 100644 (file)
@@ -1375,6 +1375,7 @@ Note that using the navigation links will reset this column.',
 'mergehistory-autocomment'         => 'Merged [[:$1]] into [[:$2]]',
 'mergehistory-comment'             => 'Merged [[:$1]] into [[:$2]]: $3',
 'mergehistory-same-destination'    => 'Source and destination pages cannot be the same',
+'mergehistory-reason'              => 'Reason:',
 
 # Merge log
 'mergelog'           => 'Merge log',
index 57043d5..1194633 100644 (file)
@@ -711,6 +711,7 @@ $wgMessageStructure = array(
                'mergehistory-autocomment',
                'mergehistory-comment',
                'mergehistory-same-destination',
+               'mergehistory-reason'
        ),
        'mergelog' => array(
                'mergelog',