From: Rotem Liss Date: Sun, 25 Nov 2007 17:16:59 +0000 (+0000) Subject: Fixes. X-Git-Tag: 1.31.0-rc.0~50723 X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=33bb9d0ca979516b728affda50953748ee18ab4c;p=lhc%2Fweb%2Fwiklou.git Fixes. --- diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 4fb26faf39..97d8d74776 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1193,15 +1193,14 @@ Make sure that this change will maintain historical page continuity. 'mergehistory-from' => 'Source page:', 'mergehistory-into' => 'Destination page:', 'mergehistory-list' => 'Mergeable edit history', -'mergehistory-merge' => 'The following revisions of [[:$1|$1]] can be merged into [[:$2|$2]]. Use the radio -button column to merge in only the revisions created at and before the specified time. Note that using the -navigation links will reset this column.', +'mergehistory-merge' => 'The following revisions of [[:$1]] can be merged into [[:$2]]. Use the radio button column to merge in only the revisions created at and before the specified time. Note that using the navigation links will reset this column.', 'mergehistory-go' => 'Show mergeable edits', 'mergehistory-submit' => 'Merge revisions', 'mergehistory-empty' => 'No revisions can be merged', -'mergehistory-success' => '$3 revisions of [[:$1|$1]] successfully merged into [[:$2|$2]].', +'mergehistory-success' => '$3 revisions of [[:$1]] successfully merged into [[:$2]].', 'mergehistory-fail' => 'Unable to perform history merge, please recheck the page and time parameters.', +# Merge log 'mergelog' => 'Merge log', 'pagemerge-logentry' => 'merged [[$1]] into [[$2]] (revisions up to $3)', 'revertmerge' => 'Unmerge',