# HG changeset patch
# User unc0rr
# Date 1289149174 -10800
# Node ID 4e3942f5827ceea3d43265daf12cf452d2a0fb8a
# Parent b970559af8fbc7f92fe0930c2de129eba758cf29
Fix i18n of plural forms
diff -r b970559af8fb -r 4e3942f5827c QTfrontend/statsPage.cpp
--- a/QTfrontend/statsPage.cpp Sun Nov 07 19:49:39 2010 +0300
+++ b/QTfrontend/statsPage.cpp Sun Nov 07 19:59:34 2010 +0300
@@ -177,57 +177,51 @@
team.Wins++; // should draws count as wins?
//team.SaveToFile(); // don't save yet
}
- break;
- }
-
+ break;
+ }
+
case 'P' : {
int i = info.indexOf(' ');
- playerPosition++;
- QString color = info.left(i);
- quint32 c = color.toInt();
- QColor clanColor = QColor(qRgb((c >> 16) & 255, (c >> 8) & 255, c & 255));
+ playerPosition++;
+ QString color = info.left(i);
+ quint32 c = color.toInt();
+ QColor clanColor = QColor(qRgb((c >> 16) & 255, (c >> 8) & 255, c & 255));
- QString playerinfo = info.mid(i + 1);
-
- i = playerinfo.indexOf(' ');
+ QString playerinfo = info.mid(i + 1);
+
+ i = playerinfo.indexOf(' ');
- QString kills = playerinfo.left(i);
- QString playername = playerinfo.mid(i + 1);
- QString image;
+ int kills = playerinfo.left(i).toInt();
+ QString playername = playerinfo.mid(i + 1);
+ QString image;
if (lastColor == c && playerPosition <= 2) playerPosition = 1;
- lastColor = c;
+ lastColor = c;
- switch (playerPosition)
- {
- case 1:
- image = "<img src=\":/res/StatsMedal1.png\">";
- break;
- case 2:
- image = "<img src=\":/res/StatsMedal2.png\">";
- break;
- case 3:
- image = "<img src=\":/res/StatsMedal3.png\">";
- break;
- default:
- image = "<img src=\":/res/StatsMedal4.png\">";
- break;
- }
+ switch (playerPosition)
+ {
+ case 1:
+ image = "<img src=\":/res/StatsMedal1.png\">";
+ break;
+ case 2:
+ image = "<img src=\":/res/StatsMedal2.png\">";
+ break;
+ case 3:
+ image = "<img src=\":/res/StatsMedal3.png\">";
+ break;
+ default:
+ image = "<img src=\":/res/StatsMedal4.png\">";
+ break;
+ }
QString message;
- QString killstring;
- if (kills.toInt() == 1)
- {
- killstring = PageGameStats::tr("(%1 kill)").arg(kills);
- } else {
- killstring = PageGameStats::tr("(%1 kills)").arg(kills);
- }
-
- message = QString("<p><h2>%1 %2. <font color=\"%4\">%3</font> ").arg(image, QString::number(playerPosition), playername, clanColor.name()) + killstring + "</h2></p>";
-
- labelGameRank->setText(labelGameRank->text() + message);
- break;
- }
+ QString killstring = PageGameStats::tr("(%1 kill)", "", kills).arg(kills);
+
+ message = QString("<p><h2>%1 %2. <font color=\"%4\">%3</font> ").arg(image, QString::number(playerPosition), playername, clanColor.name()) + killstring + "</h2></p>";
+
+ labelGameRank->setText(labelGameRank->text() + message);
+ break;
+ }
case 's' : {
int i = info.indexOf(' ');
QString message = "<p><img src=\":/res/StatsMostSelfDamage.png\"> " + PageGameStats::tr("<b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.").arg(info.mid(i + 1), info.left(i)) + "</p>";
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_ar.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun Nov 07 19:59:34 2010 +0300
@@ -365,13 +365,12 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_bg.ts
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Nov 07 19:59:34 2010 +0300
@@ -336,13 +336,12 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_cs.ts
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Nov 07 19:59:34 2010 +0300
@@ -339,13 +339,13 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Nov 07 19:59:34 2010 +0300
@@ -377,13 +377,16 @@
<numerusform>Insgesamt fanden <b>%1</b> Igel ein trauriges Ende in dieser Runde.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 Kill)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 Kill)</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 Kills)</translation>
+ <translation type="obsolete">(%1 Kills)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_en.ts
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Sun Nov 07 19:59:34 2010 +0300
@@ -371,13 +371,12 @@
<numerusform>A total of <b>%1</b> hedgehogs were killed during this round.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_es.ts
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Sun Nov 07 19:59:34 2010 +0300
@@ -375,13 +375,16 @@
<numerusform>Un total de <b>%1</b> erizos murieron esta ronda.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 baja)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 baja)</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 bajas)</translation>
+ <translation type="obsolete">(%1 bajas)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_fi.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun Nov 07 19:59:34 2010 +0300
@@ -371,13 +371,16 @@
<numerusform>Yhteensä <b>%1</b> siiltä tapettiin tämän erän aikana.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 tappo)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 tappo)</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 tappoa)</translation>
+ <translation type="obsolete">(%1 tappoa)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_fr.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Nov 07 19:59:34 2010 +0300
@@ -368,13 +368,12 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_hu.ts
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun Nov 07 19:59:34 2010 +0300
@@ -363,13 +363,11 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Nov 07 19:59:34 2010 +0300
@@ -372,13 +372,12 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_ja.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun Nov 07 19:59:34 2010 +0300
@@ -333,13 +333,11 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_pl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Nov 07 19:59:34 2010 +0300
@@ -380,13 +380,17 @@
<numerusform>W tej rundzie zostało zabitych <b>%1</b> jeży.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 zabity)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 zabity)</numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 zabitych)</translation>
+ <translation type="obsolete">(%1 zabitych)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Nov 07 19:59:34 2010 +0300
@@ -413,13 +413,16 @@
<numerusform><b>%1</b> ouriços foram mortos neste round.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 morte)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 morte)</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 mortes)</translation>
+ <translation type="obsolete">(%1 mortes)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun Nov 07 19:59:34 2010 +0300
@@ -371,13 +371,16 @@
<numerusform>Um total de <b>%1</b> ouriços perderam a vida durante esta ronda.</numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 morto)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 morto)</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 mortos)</translation>
+ <translation type="obsolete">(%1 mortos)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Nov 07 19:59:34 2010 +0300
@@ -373,13 +373,13 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Nov 07 19:59:34 2010 +0300
@@ -373,13 +373,13 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_sv.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun Nov 07 19:59:34 2010 +0300
@@ -371,13 +371,16 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 död)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 död)</numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 döda)</translation>
+ <translation type="obsolete">(%1 döda)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun Nov 07 19:59:34 2010 +0300
@@ -341,13 +341,11 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_uk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Nov 07 19:59:34 2010 +0300
@@ -373,13 +373,13 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun Nov 07 19:59:34 2010 +0300
@@ -366,13 +366,15 @@
<numerusform>本轮总共有 <b>%1</b> 只刺猬被击杀.</p></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation>(%1 灭杀)</translation>
+ <translation type="unfinished">
+ <numerusform>(%1 灭杀)</numerusform>
+ </translation>
</message>
<message>
<source>(%1 kills)</source>
- <translation>(%1 灭杀)</translation>
+ <translation type="obsolete">(%1 灭杀)</translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
diff -r b970559af8fb -r 4e3942f5827c share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun Nov 07 19:49:39 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun Nov 07 19:59:34 2010 +0300
@@ -363,13 +363,11 @@
<numerusform></numerusform>
</translation>
</message>
- <message>
+ <message numerus="yes">
<source>(%1 kill)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <source>(%1 kills)</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>