# HG changeset patch
# User unc0rr
# Date 1255537841 0
# Node ID 228757f6c54d6b99d1370ea8ac7618c6791b8ebb
# Parent 9ae320bf2986c90d332122884fb32eb82348cab8
- Update some strings
- Update english (plural form) and russian (not finished) translations
diff -r 9ae320bf2986 -r 228757f6c54d QTfrontend/newnetclient.cpp
--- a/QTfrontend/newnetclient.cpp Wed Oct 14 15:05:00 2009 +0000
+++ b/QTfrontend/newnetclient.cpp Wed Oct 14 16:30:41 2009 +0000
@@ -410,9 +410,9 @@
}
emit nickRemoved(lst[1]);
if (lst.size() < 3)
- emit chatStringFromNet(tr("%1 *** %2 has left ]").arg('\x03').arg(lst[1]));
+ emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
else
- emit chatStringFromNet(tr("%1 *** %2 has left (%3) ]").arg('\x03').arg(lst[1], lst[2]));
+ emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
return;
}
@@ -434,9 +434,9 @@
}
emit nickRemovedLobby(lst[1]);
if (lst.size() < 3)
- emit chatStringLobby(tr("%1 *** %2 has left ]").arg('\x03').arg(lst[1]));
+ emit chatStringLobby(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
else
- emit chatStringLobby(tr("%1 *** %2 has left (%3) ]").arg('\x03').arg(lst[1], lst[2]));
+ emit chatStringLobby(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
return;
}
diff -r 9ae320bf2986 -r 228757f6c54d QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp Wed Oct 14 15:05:00 2009 +0000
+++ b/QTfrontend/pages.cpp Wed Oct 14 16:30:41 2009 +0000
@@ -869,13 +869,13 @@
item = new QTableWidgetItem(list[i + 2]); // number of clients
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setTextAlignment(Qt::AlignCenter);
- item->setToolTip(tr("There are %1 clients connected to this room.").arg(list[i + 2]));
+ item->setToolTip(tr("There are %1 clients connected to this room.", "", list[i + 2].toInt()).arg(list[i + 2]));
roomsList->setItem(r, 1, item);
item = new QTableWidgetItem(list[i + 3]); // number of teams
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setTextAlignment(Qt::AlignCenter);
- item->setToolTip(tr("There are %1 teams participating in this room.").arg(list[i + 3]));
+ item->setToolTip(tr("There are %1 teams participating in this room.", "", list[i + 3].toInt()).arg(list[i + 3]));
roomsList->setItem(r, 2, item);
item = new QTableWidgetItem(list[i + 4]); // name of host
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_bg.qm
Binary file share/hedgewars/Data/Locale/hedgewars_bg.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_bg.ts
--- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_cs.qm
Binary file share/hedgewars/Data/Locale/hedgewars_cs.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_cs.ts
--- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_de.qm
Binary file share/hedgewars/Data/Locale/hedgewars_de.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_de.ts
--- a/share/hedgewars/Data/Locale/hedgewars_de.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_en.qm
Binary file share/hedgewars/Data/Locale/hedgewars_en.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_en.ts
--- a/share/hedgewars/Data/Locale/hedgewars_en.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Wed Oct 14 16:30:41 2009 +0000
@@ -16,9 +16,9 @@
-
-
-
+
+ Every %1 turn
+ Every %1 turn
@@ -191,19 +191,19 @@
-
+ %1 *** %2 has joined the room
-
+ %1 *** %2 has joined
-
-
+
+ %1 *** %2 has left (%3)
-
-
+
+ %1 *** %2 has left
@@ -254,16 +254,16 @@
-
-
-
+
+ <p>The best killer is <b>%1</b> with <b>%2</b> kill in a turn.</p>
+ <p>The best killer is <b>%1</b> with <b>%2</b> kills in a turn.</p>
-
-
-
+
+ <p>A total of <b>%1</b> hedgehog was killed during this round.</p>
+ <p>A total of <b>%1</b> hedgehogs were killed during this round.</p>
@@ -412,13 +412,19 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+ There is %1 client connected to this room.
+ There are %1 clients connected to this room.
+
-
+
-
+
+ There is %1 team participating in this room.
+ There are %1 teams participating in this room.
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_es.qm
Binary file share/hedgewars/Data/Locale/hedgewars_es.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_es.ts
--- a/share/hedgewars/Data/Locale/hedgewars_es.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_fi.qm
Binary file share/hedgewars/Data/Locale/hedgewars_fi.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_fi.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_fr.qm
Binary file share/hedgewars/Data/Locale/hedgewars_fr.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_fr.ts
--- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_it.qm
Binary file share/hedgewars/Data/Locale/hedgewars_it.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_it.ts
--- a/share/hedgewars/Data/Locale/hedgewars_it.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Wed Oct 14 16:30:41 2009 +0000
@@ -179,11 +179,11 @@
-
+
-
+
@@ -393,13 +393,19 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
+
-
+
-
+
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_ja.qm
Binary file share/hedgewars/Data/Locale/hedgewars_ja.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_ja.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_pl.qm
Binary file share/hedgewars/Data/Locale/hedgewars_pl.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_pl.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Wed Oct 14 16:30:41 2009 +0000
@@ -199,11 +199,11 @@
-
+
-
+
@@ -415,13 +415,21 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
+
+
-
+
-
+
+
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_pt_BR.qm
Binary file share/hedgewars/Data/Locale/hedgewars_pt_BR.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_pt_PT.qm
Binary file share/hedgewars/Data/Locale/hedgewars_pt_PT.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
--- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_ru.qm
Binary file share/hedgewars/Data/Locale/hedgewars_ru.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_ru.ts
--- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Wed Oct 14 16:30:41 2009 +0000
@@ -1,6 +1,6 @@
-
+AmmoSchemeModel
@@ -16,8 +16,10 @@
-
-
+
+ Каждый %1 ход
+ Каждый %1 ход
+ Каждый %1 ход
@@ -167,23 +169,30 @@
registered on Hedgewars.org
Please provide your password
or pick another nickname:
-
+ Ваш псевдоним %1 уже
+зарегистрирован на сайте Hedgewars.org
+Пожалуйста, укажите ваш пароль
+или выберите другой псевдоним:
-
+ %1 *** %2 вошёл в комнату
-
+ %1 *** %2 вошёл
+
+
+
+ %1 *** %2 ушёл
-
-
+
+ %1 *** %2 ушёл (%3)
-
-
+
+ %1 *** %2 ушёл
@@ -205,7 +214,7 @@
-
+ Очистить кэш учётных записей
@@ -234,14 +243,18 @@
-
-
+
+ <p>Лучший киллер <b>%1</b> с <b>%2</b> убитыми за ход.</p>
+ <p>Лучший киллер <b>%1</b> с <b>%2</b> убитыми за ход.</p>
+ <p>Лучший киллер <b>%1</b> с <b>%2</b> убитыми за ход.</p>
-
-
+
+ <p>Всего <b>%1</b> ёж был убит в течение этой игры.</p>
+ <p>Всего <b>%1</b> ёжа были убиты в течение этой игры.</p>
+ <p>Всего <b>%1</b> ёжей были убиты в течение этой игры.</p>
@@ -378,45 +391,55 @@
-
+ Название комнаты:
-
+ В этой комнате игра ещё не запущена.
+Вы можете зайти и присоединиться к игре.
-
+ В этой комнате происходит игра.
+Вы можете зайти и наблюдать. Чтобы играть, придётся подождать окончания текущей игры.
-
+
-
+
+ В этой комнате %1 игрок.
+ В этой комнате %1 игрока.
+ В этой комнате %1 игроков.
+
-
+
-
+
+ В этой комнате %1 команда.
+ В этой комнате %1 команды.
+ В этой комнате %1 команд.
+
-
+ %1 управляет комнатой. Он может изменять настройки и запускать игру.
-
+ Случайная карта
-
+ Можно играть на нарисованных или сгенерированных картах.
-
+ Схема игры определяет общие настройки, такие как время хода или вампиризм.
-
+ Схема оружия определяет доступное оружие и число снарядов.
@@ -547,7 +570,7 @@
QCheckBox
-
+ Проверять обновления при запуске
@@ -587,15 +610,15 @@
-
+ Эффекты фронтенда (необходим перезапуск)
-
+ Пониженное качество
-
+ Аппаратный звук (если доступен; необходим перезапуск)
@@ -832,11 +855,11 @@
-
+ Псевдоним
-
+ Пожалуйста, введите ваш псевдоним
@@ -918,31 +941,31 @@
-
+ Название
-
+ И
-
+ К
-
+ Главный
- Карта
+ Карта
-
+ Правила
- Оружие
+ Оружие
@@ -968,11 +991,11 @@
SelWeaponWidget
-
+ Набор оружия
-
+ Вероятности
@@ -1183,42 +1206,42 @@
-
+ увеличить
-
+ уменьшить
-
+ сбросить увеличение
-
+ прыжок в длину
-
+ прыжок в высотуbinds (categories)
-
+ Основное управление
-
+ Управление оружием
-
+ Управление камерой и курсором
- Разное
+ Разное
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_sk.qm
Binary file share/hedgewars/Data/Locale/hedgewars_sk.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_sv.qm
Binary file share/hedgewars/Data/Locale/hedgewars_sv.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_sv.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_tr_TR.qm
Binary file share/hedgewars/Data/Locale/hedgewars_tr_TR.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
--- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_uk.qm
Binary file share/hedgewars/Data/Locale/hedgewars_uk.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_uk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_zh_CN.qm
Binary file share/hedgewars/Data/Locale/hedgewars_zh_CN.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_zh_TW.qm
Binary file share/hedgewars/Data/Locale/hedgewars_zh_TW.qm has changed
diff -r 9ae320bf2986 -r 228757f6c54d share/hedgewars/Data/Locale/hedgewars_zh_TW.ts
--- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Wed Oct 14 15:05:00 2009 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Wed Oct 14 16:30:41 2009 +0000
@@ -178,11 +178,11 @@
-
+
-
+
@@ -390,13 +390,17 @@
You may join and spectate now but you'll have to wait for the game to end to start playing.
-
+
-
+
+
+
-
+
-
+
+
+