From 67d5296699de9c24a11fa4e6884edbd65dadecfb Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 8 Mar 2009 20:13:29 +0000 Subject: [PATCH] Add mergehistory-reason, missing from r48159 --- languages/messages/MessagesEn.php | 1 + maintenance/language/messages.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a1f84ddf0a..7b687f4a8f 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -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', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 57043d5323..1194633361 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -711,6 +711,7 @@ $wgMessageStructure = array( 'mergehistory-autocomment', 'mergehistory-comment', 'mergehistory-same-destination', + 'mergehistory-reason' ), 'mergelog' => array( 'mergelog', -- 2.20.1