# HG changeset patch
# User unc0rr
# Date 1347187521 -14400
# Node ID 46a91cbed8dbb8157736b325ddffb691a493af7d
# Parent bfa26daad684a01aeb716fd50112e2f87110b845
- Some improvements to tr() calls
- Translate some entries in russian and english translations
diff -r bfa26daad684 -r 46a91cbed8db QTfrontend/ui/page/pagenettype.cpp
--- a/QTfrontend/ui/page/pagenettype.cpp Sun Sep 09 13:40:02 2012 +0400
+++ b/QTfrontend/ui/page/pagenettype.cpp Sun Sep 09 14:45:21 2012 +0400
@@ -33,7 +33,7 @@
pageLayout->setColumnStretch(3, 10);
BtnLAN = addButton(tr("LAN game"), pageLayout, 1, 2);
- BtnLAN->setWhatsThis(tr("Hoin or host your own game server in a Local Area Network."));
+ BtnLAN->setWhatsThis(tr("Join or host your own game server in a Local Area Network."));
BtnOfficialServer = addButton(tr("Official server"), pageLayout, 2, 2);
BtnOfficialServer->setWhatsThis(tr("Join hundreds of players online!"));
diff -r bfa26daad684 -r 46a91cbed8db QTfrontend/ui/page/pageoptions.cpp
--- a/QTfrontend/ui/page/pageoptions.cpp Sun Sep 09 13:40:02 2012 +0400
+++ b/QTfrontend/ui/page/pageoptions.cpp Sun Sep 09 14:45:21 2012 +0400
@@ -399,6 +399,10 @@
}
connect(mapper, SIGNAL(mapped(int)), this, SLOT(colorButtonClicked(int)));
+
+ QPushButton * btn = new QPushButton(this);
+ gbCLayout->addWidget(btn, (model->rowCount() - 1) / 3 + 1, 0, 1, 3);
+ btn->setText(tr("Reset to default colors"));
}
{
diff -r bfa26daad684 -r 46a91cbed8db QTfrontend/ui/page/pagevideos.cpp
--- a/QTfrontend/ui/page/pagevideos.cpp Sun Sep 09 13:40:02 2012 +0400
+++ b/QTfrontend/ui/page/pagevideos.cpp Sun Sep 09 14:45:21 2012 +0400
@@ -489,7 +489,7 @@
return QString("%1 MiB").arg(QString::number(float(size)/MiB, 'f', 2));
if (size >= KiB)
return QString("%1 KiB").arg(QString::number(float(size)/KiB, 'f', 2));
- return PageVideos::tr("%1 bytes").arg(QString::number(size));
+ return PageVideos::tr("%1 bytes", "", size).arg(QString::number(size));
}
// set file size in file list in specified row
@@ -862,7 +862,7 @@
// ask user if (s)he is serious
if (QMessageBox::question(this,
tr("Are you sure?"),
- tr("Do you really want do remove %1 file(s)?").arg(num),
+ tr("Do you really want do remove %1 file(s)?", "", num).arg(num),
QMessageBox::Yes | QMessageBox::No)
!= QMessageBox::Yes)
return;
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_ar.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun Sep 09 14:45:21 2012 +0400
@@ -989,13 +989,13 @@
<translation>الخادم الرسمي</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -1059,6 +1059,10 @@
<source>Advanced</source>
<translation type="unfinished">متقدم</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1461,9 +1465,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1485,9 +1492,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_bg.ts
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Sep 09 14:45:21 2012 +0400
@@ -977,11 +977,11 @@
<translation>Официален сървър</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1035,6 +1035,10 @@
<source>Advanced</source>
<translation type="unfinished">За напреднали</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1421,9 +1425,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1445,9 +1452,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_cs.ts
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Sep 09 14:45:21 2012 +0400
@@ -989,11 +989,11 @@
<translation>Oficiální server</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1047,6 +1047,10 @@
<source>Advanced</source>
<translation type="unfinished">Rozšířené</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1454,9 +1458,13 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1478,9 +1486,13 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1059,11 +1059,11 @@
<translation>Offizieller Server</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1129,6 +1129,10 @@
<source>Advanced</source>
<translation type="unfinished">Erweitert</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1537,9 +1541,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1561,9 +1568,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_en.ts
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Sun Sep 09 14:45:21 2012 +0400
@@ -617,14 +617,12 @@
<source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source>
<translation type="unfinished">
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source><b>%1</b> killed <b>%2</b> of his own hedgehogs.</source>
<translation type="unfinished">
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
@@ -1005,13 +1003,13 @@
<translation>Official server</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -1075,6 +1073,10 @@
<source>Advanced</source>
<translation type="unfinished">Advanced</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1221,7 +1223,6 @@
<source>%1 players online</source>
<translation type="unfinished">
<numerusform></numerusform>
- <numerusform></numerusform>
</translation>
</message>
</context>
@@ -1471,9 +1472,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation>
+ <numerusform>%1 byte</numerusform>
+ <numerusform>%1 bytes</numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1495,9 +1499,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation>
+ <numerusform>Do you really want do remove %1 file?</numerusform>
+ <numerusform>Do you really want do remove %1 files?</numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_es.ts
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1059,11 +1059,11 @@
<translation>Servidor oficial</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1129,6 +1129,10 @@
<source>Advanced</source>
<translation type="unfinished">Avanzado</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1537,9 +1541,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1561,9 +1568,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_fi.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1034,11 +1034,11 @@
<translation>Virallinen palvelin</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1104,6 +1104,10 @@
<source>Advanced</source>
<translation type="unfinished">Lisäasetukset</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1512,9 +1516,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1536,9 +1543,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_fr.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1029,11 +1029,11 @@
<translation>Serveur officiel</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1087,6 +1087,10 @@
<source>Advanced</source>
<translation type="unfinished">Avancé</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1494,9 +1498,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1518,9 +1525,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_hu.ts
--- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun Sep 09 14:45:21 2012 +0400
@@ -983,11 +983,11 @@
<translation>Hivatalos szerver</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1053,6 +1053,10 @@
<source>Advanced</source>
<translation type="unfinished">Haladó</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1449,9 +1453,11 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1473,9 +1479,11 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1035,11 +1035,11 @@
<translation>Server ufficiale</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1105,6 +1105,10 @@
<source>Advanced</source>
<translation type="unfinished">Avanzato</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1521,9 +1525,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1545,9 +1552,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_ja.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun Sep 09 14:45:21 2012 +0400
@@ -964,13 +964,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -1022,6 +1022,10 @@
<source>Advanced</source>
<translation type="unfinished">高級</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1367,9 +1371,11 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1391,9 +1397,11 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_ko.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ko.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts Sun Sep 09 14:45:21 2012 +0400
@@ -905,13 +905,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -963,6 +963,10 @@
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1283,9 +1287,11 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1307,9 +1313,11 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_lt.ts
--- a/share/hedgewars/Data/Locale/hedgewars_lt.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_lt.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1112,7 +1112,7 @@
</message>
<message>
<location filename="../../../../QTfrontend/ui/page/pagenettype.cpp" line="36"/>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1188,6 +1188,11 @@
<source>Delete weapon set</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="405"/>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1592,10 +1597,14 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="492"/>
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="736"/>
@@ -1624,10 +1633,14 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="865"/>
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="949"/>
@@ -1713,7 +1726,7 @@
<context>
<name>QCheckBox</name>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="426"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="430"/>
<source>Show ammo menu tooltips</source>
<translation type="unfinished"></translation>
</message>
@@ -1723,7 +1736,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="431"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="435"/>
<source>Append date and time to record file name</source>
<translation type="unfinished"></translation>
</message>
@@ -1768,7 +1781,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="419"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="423"/>
<source>Show FPS</source>
<translation type="unfinished"></translation>
</message>
@@ -1992,7 +2005,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="407"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="411"/>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
@@ -2172,7 +2185,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="413"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="417"/>
<source>FPS limit</source>
<translation type="unfinished"></translation>
</message>
@@ -2594,7 +2607,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="435"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="439"/>
<source>Associate file extensions</source>
<translation type="unfinished"></translation>
</message>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_nl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_nl.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts Sun Sep 09 14:45:21 2012 +0400
@@ -922,13 +922,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -980,6 +980,10 @@
<source>Advanced</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1301,9 +1305,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1325,9 +1332,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_pl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1087,11 +1087,11 @@
<translation>Oficjalny serwer</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1157,6 +1157,10 @@
<source>Advanced</source>
<translation type="unfinished">Zaawansowane</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1576,9 +1580,13 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1600,9 +1608,13 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1097,11 +1097,11 @@
<translation>Servidor Oficial</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1167,6 +1167,10 @@
<source>Advanced</source>
<translation type="unfinished">Avançado</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1575,9 +1579,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1599,9 +1606,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1024,11 +1024,11 @@
<translation>Servidor oficial</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1094,6 +1094,10 @@
<source>Advanced</source>
<translation type="unfinished">Avançado</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1506,9 +1510,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1530,9 +1537,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Sep 09 14:45:21 2012 +0400
@@ -5,7 +5,7 @@
<name>AbstractPage</name>
<message>
<source>Go back</source>
- <translation type="unfinished"></translation>
+ <translation>Назад</translation>
</message>
</context>
<context>
@@ -77,14 +77,14 @@
</message>
<message>
<source>Game Options</source>
- <translation type="unfinished">Настройки игры</translation>
+ <translation>Настройки игры</translation>
</message>
</context>
<context>
<name>HWAskQuitDialog</name>
<message>
<source>Do yot really want to quit?</source>
- <translation type="unfinished"></translation>
+ <translation>Хотите выйти?</translation>
</message>
</context>
<context>
@@ -107,47 +107,47 @@
</message>
<message>
<source>%1 has been removed from your ignore list</source>
- <translation type="unfinished"></translation>
+ <translation>%1 был удалён из вашего списка игнорирования</translation>
</message>
<message>
<source>%1 has been added to your ignore list</source>
- <translation type="unfinished"></translation>
+ <translation>%1 был добавлен в ваш список игнорирования</translation>
</message>
<message>
<source>%1 has been removed from your friends list</source>
- <translation type="unfinished"></translation>
+ <translation>%1 был удалён из вашего списка друзей</translation>
</message>
<message>
<source>%1 has been added to your friends list</source>
- <translation type="unfinished"></translation>
+ <translation>%1 был добавлен в ваш список друзей</translation>
</message>
<message>
<source>Stylesheet imported from %1</source>
- <translation type="unfinished"></translation>
+ <translation>Импортирован стиль из %1</translation>
</message>
<message>
<source>Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset!</source>
- <translation type="unfinished"></translation>
+ <translation>Введите %1 для использования текущего стиля и в будущем, введите %2 для сброса!</translation>
</message>
<message>
<source>Couldn't read %1</source>
- <translation type="unfinished"></translation>
+ <translation>Не могу прочитать %1</translation>
</message>
<message>
<source>StyleSheet discarded</source>
- <translation type="unfinished"></translation>
+ <translation>Стиль снят</translation>
</message>
<message>
<source>StyleSheet saved to %1</source>
- <translation type="unfinished"></translation>
+ <translation>Стиль сохранён в %1</translation>
</message>
<message>
<source>Failed to save StyleSheet to %1</source>
- <translation type="unfinished"></translation>
+ <translation>Ошибка при сохранении стиля в %1</translation>
</message>
<message>
<source>%1 is not a valid command!</source>
- <translation type="unfinished"></translation>
+ <translation>%1 не является корректной командой</translation>
</message>
</context>
<context>
@@ -192,15 +192,15 @@
</message>
<message>
<source>Demo name</source>
- <translation type="unfinished"></translation>
+ <translation>Название демки</translation>
</message>
<message>
<source>Demo name:</source>
- <translation type="unfinished"></translation>
+ <translation>Название демки:</translation>
</message>
<message>
<source>Game aborted</source>
- <translation type="unfinished"></translation>
+ <translation>Игра прекращена</translation>
</message>
<message>
<source>Password</source>
@@ -211,32 +211,32 @@
registered on Hedgewars.org
Please provide your password below
or pick another nickname in game config:</source>
- <translation type="unfinished">Ваше имя пользователя %1
+ <translation>Ваше имя пользователя %1
зарегистрировано на сайте hedgewars.org
Пожалуйста, укажите ваш пароль в поле ввода внизу
или выберите иное имя пользователя в настройках игры:</translation>
</message>
<message>
<source>No password supplied.</source>
- <translation type="unfinished"></translation>
+ <translation>Пароль не указан.</translation>
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Псевдоним</translation>
+ <translation>Псевдоним</translation>
</message>
<message>
<source>Some one already uses
your nickname %1
on the server.
Please pick another nickname:</source>
- <translation type="unfinished">Кто-то на этом сервере
+ <translation>Кто-то на этом сервере
уже использует
ваш псевдоним %1.
Выберите другой псевдоним:</translation>
</message>
<message>
<source>No nickname supplied.</source>
- <translation type="unfinished"></translation>
+ <translation>Псевдоним не указан.</translation>
</message>
</context>
<context>
@@ -418,33 +418,33 @@
</message>
<message>
<source>User quit</source>
- <translation type="unfinished"></translation>
+ <translation>Пользователь вышел</translation>
</message>
<message>
<source>Remote host has closed connection</source>
- <translation type="unfinished"></translation>
+ <translation>Удалённый хост закрыл соединение</translation>
</message>
<message>
<source>The server is too old. Disconnecting now.</source>
- <translation type="unfinished"></translation>
+ <translation>Слишком старый сервер. Отсоединяюсь.</translation>
</message>
</context>
<context>
<name>HWPasswordDialog</name>
<message>
<source>Password</source>
- <translation type="unfinished">Пароль</translation>
+ <translation>Пароль</translation>
</message>
</context>
<context>
<name>HWUploadVideoDialog</name>
<message>
<source>Upload video</source>
- <translation type="unfinished"></translation>
+ <translation>Залить видео</translation>
</message>
<message>
<source>Upload</source>
- <translation type="unfinished"></translation>
+ <translation>Залить</translation>
</message>
</context>
<context>
@@ -459,19 +459,19 @@
<message>
<source>Duration: %1m %2s
</source>
- <translation type="unfinished"></translation>
+ <translation>Длительность: %1мин %2сек</translation>
</message>
<message>
<source>Video: %1x%2, </source>
- <translation type="unfinished"></translation>
+ <translation>Видео: %1x%2, </translation>
</message>
<message>
<source>%1 fps, </source>
- <translation type="unfinished"></translation>
+ <translation>%1 кадров/сек,</translation>
</message>
<message>
<source>Audio: </source>
- <translation type="unfinished"></translation>
+ <translation>Аудио: </translation>
</message>
</context>
<context>
@@ -556,15 +556,15 @@
</message>
<message>
<source>Drawn Maps</source>
- <translation type="unfinished"></translation>
+ <translation>Рисованные карты</translation>
</message>
<message>
<source>All files</source>
- <translation type="unfinished"></translation>
+ <translation>Все файлы</translation>
</message>
<message>
<source>Eraser</source>
- <translation type="unfinished"></translation>
+ <translation>Стирательная резинка</translation>
</message>
</context>
<context>
@@ -669,14 +669,14 @@
<name>PageInGame</name>
<message>
<source>In game...</source>
- <translation type="unfinished"></translation>
+ <translation>В игре...</translation>
</message>
</context>
<context>
<name>PageInfo</name>
<message>
<source>Open the snapshot folder</source>
- <translation type="unfinished"></translation>
+ <translation>Открыть папку скриншотов</translation>
</message>
</context>
<context>
@@ -940,23 +940,23 @@
</message>
<message>
<source>Local Game</source>
- <translation type="unfinished"></translation>
+ <translation>Локальная игра</translation>
</message>
<message>
<source>Play a game on a single computer</source>
- <translation type="unfinished"></translation>
+ <translation>Играть на одном компьютере</translation>
</message>
<message>
<source>Network Game</source>
- <translation type="unfinished"></translation>
+ <translation>Сетевая игра</translation>
</message>
<message>
<source>Play a game across a network</source>
- <translation type="unfinished"></translation>
+ <translation>Играть по сети</translation>
</message>
<message>
<source>Read about who is behind the Hedgewars Project</source>
- <translation type="unfinished"></translation>
+ <translation>Прочитать, кто стоит за проектом Hedgewars</translation>
</message>
<message>
<source>Leave a feedback here reporting issues, suggesting features or just saying how you like Hedgewars</source>
@@ -968,15 +968,15 @@
</message>
<message>
<source>Exit game</source>
- <translation type="unfinished"></translation>
+ <translation>Выйти из игры</translation>
</message>
<message>
<source>Manage videos recorded from game</source>
- <translation type="unfinished"></translation>
+ <translation>Управление видеозаписями игры</translation>
</message>
<message>
<source>Edit game preferences</source>
- <translation type="unfinished"></translation>
+ <translation>Редактировать настройки игры</translation>
</message>
</context>
<context>
@@ -1035,12 +1035,12 @@
<translation>Официальный сервер</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
- <translation type="unfinished"></translation>
+ <translation>Присоединиться к сотням игроков!</translation>
+ </message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation>Присоединиться или создать собственный сервер в локальной сети.</translation>
</message>
</context>
<context>
@@ -1099,11 +1099,15 @@
</message>
<message>
<source>General</source>
- <translation type="unfinished">Основные настройки</translation>
+ <translation>Основные настройки</translation>
</message>
<message>
<source>Advanced</source>
- <translation type="unfinished">Дополнительно</translation>
+ <translation>Дополнительно</translation>
+ </message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation>Сбросить на цвета по умолчанию</translation>
</message>
</context>
<context>
@@ -1394,7 +1398,7 @@
</message>
<message>
<source>Add an indestructible border along the bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Добавить неразрушимую границу внизу карты</translation>
</message>
</context>
<context>
@@ -1444,117 +1448,125 @@
</message>
<message>
<source>Simple Game</source>
- <translation type="unfinished"></translation>
+ <translation>Простая игра</translation>
</message>
<message>
<source>Play a quick game against the computer with random settings</source>
- <translation type="unfinished"></translation>
+ <translation>Играть против компьютера</translation>
</message>
<message>
<source>Multiplayer</source>
- <translation type="unfinished"></translation>
+ <translation>Схватка</translation>
</message>
<message>
<source>Play a hotseat game against your friends, or AI teams</source>
- <translation type="unfinished"></translation>
+ <translation>Играть с друзьями за одним компьютером или против ботов</translation>
</message>
<message>
<source>Campaign Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Кампания</translation>
</message>
<message>
<source>Training Mode</source>
- <translation type="unfinished"></translation>
+ <translation>Тренировка</translation>
</message>
<message>
<source>Practice your skills in a range of training missions</source>
- <translation type="unfinished"></translation>
+ <translation>Тренировка мастерства в тренировочных миссиях</translation>
</message>
<message>
<source>Demos</source>
- <translation type="unfinished"></translation>
+ <translation>Демки</translation>
</message>
<message>
<source>Watch recorded demos</source>
- <translation type="unfinished"></translation>
+ <translation>Смотреть записанные демки</translation>
</message>
<message>
<source>Load</source>
- <translation type="unfinished">Загрузить</translation>
+ <translation>Загрузить</translation>
</message>
<message>
<source>Load a previously saved game</source>
- <translation type="unfinished"></translation>
+ <translation>Загрузить сохранённую игру</translation>
</message>
</context>
<context>
<name>PageTraining</name>
<message>
<source>No description available</source>
- <translation type="unfinished"></translation>
+ <translation>Описание отсутствует</translation>
</message>
<message>
<source>Select a mission!</source>
- <translation type="unfinished"></translation>
+ <translation>Выберите миссию!</translation>
</message>
<message>
<source>Pick the mission or training to play</source>
- <translation type="unfinished"></translation>
+ <translation>Выберите миссию или тренировку</translation>
</message>
<message>
<source>Start fighting</source>
- <translation type="unfinished"></translation>
+ <translation>Начать битву</translation>
</message>
</context>
<context>
<name>PageVideos</name>
<message>
<source>Name</source>
- <translation type="unfinished">Название</translation>
+ <translation>Название</translation>
</message>
<message>
<source>Size</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
+ <translation>Размер</translation>
+ </message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation>
+ <numerusform>%1 байт</numerusform>
+ <numerusform>%1 байта</numerusform>
+ <numerusform>%1 байтов</numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
- <translation type="unfinished"></translation>
+ <translation>(в игре...)</translation>
</message>
<message>
<source>Date: </source>
- <translation type="unfinished"></translation>
+ <translation>Дата: </translation>
</message>
<message>
<source>Size: </source>
- <translation type="unfinished"></translation>
+ <translation>Размер: </translation>
</message>
<message>
<source>Are you sure?</source>
- <translation type="unfinished"></translation>
+ <translation>Вы уверены?</translation>
</message>
<message>
<source>Do you really want do remove %1?</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
+ <translation>Удалить %1?</translation>
+ </message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation>
+ <numerusform>Удалить %1 файл?</numerusform>
+ <numerusform>Удалить %1 файла?</numerusform>
+ <numerusform>Удалить %1 файлов?</numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
- <translation type="unfinished"></translation>
+ <translation>кодирование</translation>
</message>
<message>
<source>uploading</source>
- <translation type="unfinished"></translation>
+ <translation>отправка</translation>
</message>
<message>
<source>Do you really want do cancel uploading %1?</source>
- <translation type="unfinished"></translation>
+ <translation>Отменить отправку %1?</translation>
</message>
</context>
<context>
@@ -1664,23 +1676,23 @@
</message>
<message>
<source>Save password</source>
- <translation type="unfinished"></translation>
+ <translation>Сохранить пароль</translation>
</message>
<message>
<source>Save account name and password</source>
- <translation type="unfinished"></translation>
+ <translation>Сохранить псевдоним и пароль</translation>
</message>
<message>
<source>Video is private</source>
- <translation type="unfinished"></translation>
+ <translation>Частное видео</translation>
</message>
<message>
<source>Record audio</source>
- <translation type="unfinished"></translation>
+ <translation>Запись звука</translation>
</message>
<message>
<source>Use game resolution</source>
- <translation type="unfinished"></translation>
+ <translation>Использовать разрешение игры</translation>
</message>
</context>
<context>
@@ -1854,23 +1866,23 @@
</message>
<message>
<source>Custom colors</source>
- <translation type="unfinished"></translation>
+ <translation>Свои цвета</translation>
</message>
<message>
<source>Miscellaneous</source>
- <translation type="unfinished"></translation>
+ <translation>Разное</translation>
</message>
<message>
<source>Video recording options</source>
- <translation type="unfinished"></translation>
+ <translation>Настройки видео</translation>
</message>
<message>
<source>Videos</source>
- <translation type="unfinished"></translation>
+ <translation>Видео</translation>
</message>
<message>
<source>Description</source>
- <translation type="unfinished"></translation>
+ <translation>Описание</translation>
</message>
</context>
<context>
@@ -2085,7 +2097,9 @@
<source>There are videos that are currently being processed.
Exiting now will abort them.
Do yot really want to quit?</source>
- <translation type="unfinished"></translation>
+ <translation>Сейчас происходит обработка видео.
+Выход отменить обработку.
+Всё равно выйти?</translation>
</message>
<message>
<source>Please provide either the YouTube account name or the email address associated with the Google Account.</source>
@@ -2097,7 +2111,7 @@
</message>
<message>
<source>Password: </source>
- <translation type="unfinished"></translation>
+ <translation>Пароль:</translation>
</message>
<message>
<source>Video title: </source>
@@ -2117,11 +2131,11 @@
</message>
<message>
<source>Description</source>
- <translation type="unfinished"></translation>
+ <translation>Описание</translation>
</message>
<message>
<source>Nickname</source>
- <translation type="unfinished">Псевдоним</translation>
+ <translation>Псевдоним</translation>
</message>
<message>
<source>Format</source>
@@ -2129,11 +2143,11 @@
</message>
<message>
<source>Audio codec</source>
- <translation type="unfinished"></translation>
+ <translation>Видеокодек</translation>
</message>
<message>
<source>Video codec</source>
- <translation type="unfinished"></translation>
+ <translation>Аудиокодек</translation>
</message>
<message>
<source>Framerate</source>
@@ -2152,11 +2166,11 @@
</message>
<message>
<source>hedgehog %1</source>
- <translation type="unfinished"></translation>
+ <translation>ёжик %1</translation>
</message>
<message>
<source>anonymous</source>
- <translation type="unfinished"></translation>
+ <translation>аноним</translation>
</message>
</context>
<context>
@@ -2382,23 +2396,23 @@
</message>
<message>
<source>Set default options</source>
- <translation type="unfinished"></translation>
+ <translation>Установить настройки по умолчанию</translation>
</message>
<message>
<source>Open videos directory</source>
- <translation type="unfinished"></translation>
+ <translation>Открыть папку с видеозаписями</translation>
</message>
<message>
<source>Play</source>
- <translation type="unfinished"></translation>
+ <translation>Проиграть</translation>
</message>
<message>
<source>Upload to YouTube</source>
- <translation type="unfinished"></translation>
+ <translation>Отправить на YouTube</translation>
</message>
<message>
<source>Cancel uploading</source>
- <translation type="unfinished"></translation>
+ <translation>Отменить отправку</translation>
</message>
</context>
<context>
@@ -2436,47 +2450,47 @@
<name>RoomsListModel</name>
<message>
<source>In progress</source>
- <translation type="unfinished">В игре</translation>
+ <translation>В игре</translation>
</message>
<message>
<source>Room Name</source>
- <translation type="unfinished">Название</translation>
+ <translation>Название</translation>
</message>
<message>
<source>C</source>
- <translation type="unfinished">И</translation>
+ <translation>И</translation>
</message>
<message>
<source>T</source>
- <translation type="unfinished">К</translation>
+ <translation>К</translation>
</message>
<message>
<source>Owner</source>
- <translation type="unfinished">Главный</translation>
+ <translation>Главный</translation>
</message>
<message>
<source>Map</source>
- <translation type="unfinished">Карта</translation>
+ <translation>Карта</translation>
</message>
<message>
<source>Rules</source>
- <translation type="unfinished">Правила</translation>
+ <translation>Правила</translation>
</message>
<message>
<source>Weapons</source>
- <translation type="unfinished">Оружие</translation>
+ <translation>Оружие</translation>
</message>
<message>
<source>Random Map</source>
- <translation type="unfinished">Случайная карта</translation>
+ <translation>Случайная карта</translation>
</message>
<message>
<source>Random Maze</source>
- <translation type="unfinished">Случайный лабиринт</translation>
+ <translation>Случайный лабиринт</translation>
</message>
<message>
<source>Hand-drawn</source>
- <translation type="unfinished"></translation>
+ <translation>Рисованная карта</translation>
</message>
</context>
<context>
@@ -2625,7 +2639,7 @@
</message>
<message>
<source>Add Bottom Border</source>
- <translation type="unfinished"></translation>
+ <translation>Добавить нижнюю границу</translation>
</message>
</context>
<context>
@@ -2794,11 +2808,11 @@
</message>
<message>
<source>mute audio</source>
- <translation type="unfinished"></translation>
+ <translation>отключить звук</translation>
</message>
<message>
<source>record</source>
- <translation type="unfinished"></translation>
+ <translation>записать</translation>
</message>
</context>
<context>
@@ -2888,7 +2902,7 @@
</message>
<message>
<source>Record video:</source>
- <translation type="unfinished"></translation>
+ <translation>Запись видео:</translation>
</message>
</context>
<context>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1082,11 +1082,11 @@
<translation>Oficiálny server</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1152,6 +1152,10 @@
<source>Advanced</source>
<translation type="unfinished">Pokročilé</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1571,9 +1575,13 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1595,9 +1603,13 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_sv.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1051,11 +1051,11 @@
<translation>Officiell server</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1121,6 +1121,10 @@
<source>Advanced</source>
<translation type="unfinished">Avancerat</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1529,9 +1533,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1553,9 +1560,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun Sep 09 14:45:21 2012 +0400
@@ -941,13 +941,13 @@
<translation>Resmi sunucu</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -999,6 +999,10 @@
<source>Advanced</source>
<translation type="unfinished">Gelişmiş</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1347,9 +1351,11 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1371,9 +1377,11 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_uk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1031,11 +1031,11 @@
<translation>Офіційний сервер</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Join hundreds of players online!</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1101,6 +1101,10 @@
<source>Advanced</source>
<translation type="unfinished">Розширені</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1512,9 +1516,13 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1536,9 +1544,13 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun Sep 09 14:45:21 2012 +0400
@@ -1295,7 +1295,7 @@
</message>
<message>
<location filename="../../../../QTfrontend/ui/page/pagenettype.cpp" line="36"/>
- <source>Hoin or host your own game server in a Local Area Network.</source>
+ <source>Join or host your own game server in a Local Area Network.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1372,6 +1372,11 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="405"/>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Save</source>
<translation type="obsolete">保存</translation>
</message>
@@ -1848,10 +1853,12 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="492"/>
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="736"/>
@@ -1880,10 +1887,12 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="865"/>
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<location filename="../../../../QTfrontend/ui/page/pagevideos.cpp" line="949"/>
@@ -1983,7 +1992,7 @@
<translation type="obsolete">城堡模式</translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="419"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="423"/>
<source>Show FPS</source>
<translation>显示帧率 (FPS)</translation>
</message>
@@ -2018,7 +2027,7 @@
<translation>开启音乐</translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="426"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="430"/>
<source>Show ammo menu tooltips</source>
<translation type="unfinished"></translation>
</message>
@@ -2032,7 +2041,7 @@
<translation type="obsolete">分组</translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="431"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="435"/>
<source>Append date and time to record file name</source>
<translation>记录名称中包含具体时间日期</translation>
</message>
@@ -2283,7 +2292,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="407"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="411"/>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
@@ -2456,7 +2465,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="413"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="417"/>
<source>FPS limit</source>
<translation>FPS 上限</translation>
</message>
@@ -3131,7 +3140,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="435"/>
+ <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="439"/>
<source>Associate file extensions</source>
<translation type="unfinished"></translation>
</message>
diff -r bfa26daad684 -r 46a91cbed8db share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun Sep 09 13:40:02 2012 +0400
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun Sep 09 14:45:21 2012 +0400
@@ -967,13 +967,13 @@
<translation>官方伺服器</translation>
</message>
<message>
- <source>Hoin or host your own game server in a Local Area Network.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<source>Join hundreds of players online!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Join or host your own game server in a Local Area Network.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PageOptions</name>
@@ -1025,6 +1025,10 @@
<source>Advanced</source>
<translation type="unfinished">進階</translation>
</message>
+ <message>
+ <source>Reset to default colors</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>PagePlayDemo</name>
@@ -1417,9 +1421,11 @@
<source>Size</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>%1 bytes</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>(in progress...)</source>
@@ -1441,9 +1447,11 @@
<source>Do you really want do remove %1?</source>
<translation type="unfinished"></translation>
</message>
- <message>
+ <message numerus="yes">
<source>Do you really want do remove %1 file(s)?</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
<source>encoding</source>