From 09af7c4abd1550dc09d77be5f61cbeedb8e1be21 Mon Sep 17 00:00:00 2001
From: Rotem Liss <rotem@users.mediawiki.org>
Date: Wed, 6 Dec 2006 15:27:30 +0000
Subject: [PATCH] Merging 'diff-multi' and 'diff-multi-revs'.

---
 includes/DifferenceEngine.php     | 3 +--
 languages/messages/MessagesEn.php | 3 +--
 languages/messages/MessagesFi.php | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 412e8c0dcf..bb2fe4cde1 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -450,8 +450,7 @@ CONTROL;
 		if ( !$n )
 			return '';
 
-		$msg = wfMsgExt( 'diff-multi-revs', array( 'parseinline' ), $n );
-		return wfMsgExt( 'diff-multi', array('parseinline'), $msg );
+		return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n );
 	}
 
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b97858e8b1..baea6c71c1 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1091,8 +1091,7 @@ is placed by the site operators.",
 'selectolderversionfordiff' => 'Select an older version for comparison',
 'compareselectedversions' => 'Compare selected versions',
 'editundo'	=> 'undo',
-'diff-multi'	=> "($1 not shown.)",
-'diff-multi-revs' => "{{plural:$1|One intermediate revision|$1 intermediate revisions}}",
+'diff-multi'	=> "({{plural:$1|One intermediate revision|$1 intermediate revisions}} not shown.)",
 
 # Search results
 #
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index 8f0f014ca0..cf720d2f95 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -606,8 +606,7 @@ Syynä tähän on luultavasti jatkuva häiriköinti yhteiskäyttökoneelta.',
 'selectnewerversionfordiff' => 'Valitse uudempi versio vertailuun',
 'selectolderversionfordiff' => 'Valitse vanhempi versio vertailuun',
 'compareselectedversions'   => 'Vertaile valittuja versioita',
-'diff-multi'		=> "(Versioiden välissä $1.)",
-'diff-multi-revs'	=> "{{plural:$1|yksi muu muokkaus|$1 muuta muokkausta}}",
+'diff-multi'		=> "(Versioiden välissä {{plural:$1|yksi muu muokkaus|$1 muuta muokkausta}}.)",
 
 # Search results
 #
-- 
2.20.1