From kde-i18n-doc  Fri Jul 30 14:57:16 2010
From: David Jarvie <djarvie () kde ! org>
Date: Fri, 30 Jul 2010 14:57:16 +0000
To: kde-i18n-doc
Subject: branches/KDE/4.5/kdepim/kalarm
Message-Id: <20100730145716.11F17AC782 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=128050179320104

SVN commit 1157230 by djarvie:

Fix broken translatable strings containing two plural forms.

CCMAIL:kde-i18n-doc@kde.org


 M  +4 -3      messagewin.cpp  


--- branches/KDE/4.5/kdepim/kalarm/messagewin.cpp #1157229:1157230
@@ -887,10 +887,11 @@
 		text = i18ncp("@info", "in 1 minute's time", "in %1 minutes' time", (mins > 0 ? mins : 0));
 	else if (mins % 60 == 0)
 		text = i18ncp("@info", "in 1 hour's time", "in %1 hours' time", mins/60);
-	else if (mins % 60 == 1)
-		text = i18ncp("@info", "in 1 hour 1 minute's time", "in %1 hours 1 minute's time", mins/60);
 	else
-		text = i18ncp("@info", "in 1 hour %2 minutes' time", "in %1 hours %2 minutes' time", mins/60, mins%60);
+	{
+		QString hourText = i18ncp("@item:intext inserted into 'in ... %1 minute's time' below", "1 hour", "%1 hours", mins/60);
+		text = i18ncp("@info '%2' is the previous message '1 hour'/'%1 hours'", "in %2 1 minute's time", "in %2 %1 minutes' time", mins%60, hourText);
+	}
 	mRemainingText->setText(text);
 }