# HG changeset patch # User unc0rr # Date 1289149713 -10800 # Node ID 6acd599eee52e11ec51adaa49aba8c2e7ad1e459 # Parent 4e3942f5827ceea3d43265daf12cf452d2a0fb8a Fix some more messages diff -r 4e3942f5827c -r 6acd599eee52 QTfrontend/statsPage.cpp --- a/QTfrontend/statsPage.cpp Sun Nov 07 19:59:34 2010 +0300 +++ b/QTfrontend/statsPage.cpp Sun Nov 07 20:08:33 2010 +0300 @@ -224,19 +224,22 @@ } case 's' : { int i = info.indexOf(' '); - QString message = "

" + PageGameStats::tr("%1 thought it's good to shoot his own hedgehogs with %2 pts.").arg(info.mid(i + 1), info.left(i)) + "

"; + int num = info.left(i).toInt(); + QString message = "

" + PageGameStats::tr("%1 thought it's good to shoot his own hedgehogs with %2 pts.", "", num).arg(info.mid(i + 1), num) + "

"; AddStatText(message); break; } case 'S' : { int i = info.indexOf(' '); - QString message = "

" + PageGameStats::tr("%1 killed %2 of his own hedgehogs.").arg(info.mid(i + 1), info.left(i)) + "

"; + int num = info.left(i).toInt(); + QString message = "

" + PageGameStats::tr("%1 killed %2 of his own hedgehogs.", "", num).arg(info.mid(i + 1), num) + "

"; AddStatText(message); break; } case 'B' : { int i = info.indexOf(' '); - QString message = "

" + PageGameStats::tr("%1 was scared and skipped turn %2 times.").arg(info.mid(i + 1), info.left(i)) + "

"; + int num = info.left(i).toInt(); + QString message = "

" + PageGameStats::tr("%1 was scared and skipped turn %2 times.", "", num).arg(info.mid(i + 1), num) + "

"; AddStatText(message); break; } diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_ar.ts --- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Sun Nov 07 20:08:33 2010 +0300 @@ -372,17 +372,26 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Nov 07 20:08:33 2010 +0300 @@ -343,17 +343,26 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Nov 07 20:08:33 2010 +0300 @@ -347,17 +347,29 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Nov 07 20:08:33 2010 +0300 @@ -388,17 +388,26 @@ (%1 kills) (%1 Kills) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> dachte es ist gut seine eigenen Igel mit <b>%2</b> Punkten zu verletzen. - - + + <b>%1</b> dachte es ist gut seine eigenen Igel mit <b>%2</b> Punkten zu verletzen. + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> killte <b>%2</b> seiner eigenen Igel. - - + + <b>%1</b> killte <b>%2</b> seiner eigenen Igel. + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> hatte Angst und übersprang <b>%2</b> Runden. + + <b>%1</b> hatte Angst und übersprang <b>%2</b> Runden. + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Sun Nov 07 20:08:33 2010 +0300 @@ -378,17 +378,26 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_es.ts --- a/share/hedgewars/Data/Locale/hedgewars_es.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Sun Nov 07 20:08:33 2010 +0300 @@ -386,17 +386,26 @@ (%1 kills) (%1 bajas) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> prefiere disparar a sus miembros, con un total de <b>%2</b> pts. - - + + <b>%1</b> prefiere disparar a sus miembros, con un total de <b>%2</b> pts. + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> acabó con <b>%2</b> de sus propios miembros. - - + + <b>%1</b> acabó con <b>%2</b> de sus propios miembros. + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> tenía demasiado miedo y pasó <b>%2</b> turnos. + + <b>%1</b> tenía demasiado miedo y pasó <b>%2</b> turnos. + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_fi.ts --- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Sun Nov 07 20:08:33 2010 +0300 @@ -382,17 +382,26 @@ (%1 kills) (%1 tappoa) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> ajatteli että omia siilejä on hyvä vahingoittaa <b>%2</b> vahinkopisteellä. - - + + <b>%1</b> ajatteli että omia siilejä on hyvä vahingoittaa <b>%2</b> vahinkopisteellä. + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> tappoi <b>%2</b> omaa siiltä. - - + + <b>%1</b> tappoi <b>%2</b> omaa siiltä. + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> pelkäsi ja jätti vuoronsa väliin <b>%2</b> kertaa. + + <b>%1</b> pelkäsi ja jätti vuoronsa väliin <b>%2</b> kertaa. + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Nov 07 20:08:33 2010 +0300 @@ -375,17 +375,26 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_hu.ts --- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Sun Nov 07 20:08:33 2010 +0300 @@ -369,17 +369,23 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Nov 07 20:08:33 2010 +0300 @@ -379,17 +379,26 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_ja.ts --- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Sun Nov 07 20:08:33 2010 +0300 @@ -339,17 +339,23 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Nov 07 20:08:33 2010 +0300 @@ -392,17 +392,29 @@ (%1 kills) (%1 zabitych) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> przyjaźni się z wrogiem i zabrał swojej drużynie <b>%2</b> pkt. życia. - - + + <b>%1</b> przyjaźni się z wrogiem i zabrał swojej drużynie <b>%2</b> pkt. życia. + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> zabił <b>%2</b> spośród jego własnych jeży. - - + + <b>%1</b> zabił <b>%2</b> spośród jego własnych jeży. + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> trząsł portkami i opuścił turę <b>%2</b> razy. + + <b>%1</b> trząsł portkami i opuścił turę <b>%2</b> razy. + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Nov 07 20:08:33 2010 +0300 @@ -424,17 +424,26 @@ (%1 kills) (%1 mortes) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> pensou que era bom atirar na sua própria equipe totalizando <b>%2</b> pts. - - + + <b>%1</b> pensou que era bom atirar na sua própria equipe totalizando <b>%2</b> pts. + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> matou <b>%2</b> dos próprios ouriços.</p>. - - + + <b>%1</b> matou <b>%2</b> dos próprios ouriços.</p>. + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> estava assustado e passou o turno <b>%2</b> vezes.</p>. + + <b>%1</b> estava assustado e passou o turno <b>%2</b> vezes.</p>. + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sun Nov 07 20:08:33 2010 +0300 @@ -382,17 +382,26 @@ (%1 kills) (%1 mortos) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> axou que seria divertido disparar dispara contra a sua própria equipa com <b>%2</b> pontos de dano. - - + + <b>%1</b> axou que seria divertido disparar dispara contra a sua própria equipa com <b>%2</b> pontos de dano. + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> matou <b>%2</b> ouriços da sua própria equipa. - - + + <b>%1</b> matou <b>%2</b> ouriços da sua própria equipa. + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> estava tão intimidado que passou <b>%2</b> turnos. + + <b>%1</b> estava tão intimidado que passou <b>%2</b> turnos. + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Nov 07 20:08:33 2010 +0300 @@ -89,17 +89,17 @@ DefaultTeam - + Команда по умолчанию Hedgewars Demo File File Types - + Файл записи игры hedgewars Hedgewars Save File File Types - + Файл сохранения игры hedgewars @@ -252,7 +252,10 @@ registered on Hedgewars.org Please provide your password below or pick another nickname in game config: - + Ваше имя пользователя %1 +зарегистрировано на сайте hedgewars.org +Пожалуйста, укажите ваш пароль в поле ввода внизу +или выберите иное имя пользователя в настройках игры: @@ -347,7 +350,7 @@ Health graph - + График уровня здоровья Ranking @@ -355,43 +358,55 @@ The best shot award was won by <b>%1</b> with <b>%2</b> pts. - + Приз за лучший выстрел получает <b>%1</b> с <b>%2</b> пунктами урона. The best killer is <b>%1</b> with <b>%2</b> kills in a turn. - - - - + + Лучший убийца <b>%1</b> с <b>%2</b> убийством за ход. + Лучший убийца <b>%1</b> с <b>%2</b> убийствами за ход. + Лучший убийца <b>%1</b> с <b>%2</b> убийствами за ход. A total of <b>%1</b> hedgehog(s) were killed during this round. + + Всего <b>%1</b> ёж был убит в течение игры. + Всего <b>%1</b> ёжа был убит в течение игры. + Всего <b>%1</b> ёжей был убит в течение игры. + + + + (%1 kill) + + (%1 убийство) + (%1 убийства) + (%1 убийств) + + + + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - + <b>%1</b> посчитал нужным подстрелить друзей на <b>%2</b> пунктов урона. - (%1 kill) + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - + <b>%1</b> убил <b>%2</b> союзников. - - <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - - <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + <b>%1</b> испугался и пропустил <b>%2</b> ходов. + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Nov 07 20:08:33 2010 +0300 @@ -381,17 +381,29 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_sv.ts --- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Sun Nov 07 20:08:33 2010 +0300 @@ -382,17 +382,26 @@ (%1 kills) (%1 döda) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b> tyckte att det var bra att sjuta sina egna igelkottar med <b>%2</b> poäng. - - + + <b>%1</b> tyckte att det var bra att sjuta sina egna igelkottar med <b>%2</b> poäng. + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b> dödade <b>%2</b> av sina egna igelkottar. - - + + <b>%1</b> dödade <b>%2</b> av sina egna igelkottar. + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b> var rädd och hoppade över turer <b>%2</b> gånger. + + <b>%1</b> var rädd och hoppade över turer <b>%2</b> gånger. + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts --- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Sun Nov 07 20:08:33 2010 +0300 @@ -347,17 +347,23 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Nov 07 20:08:33 2010 +0300 @@ -381,17 +381,29 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + + + + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Sun Nov 07 20:08:33 2010 +0300 @@ -376,17 +376,23 @@ (%1 kills) (%1 灭杀) - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - <b>%1</b>另外，射击己方刺猬损失<b>%2</b>点血。 - - + + <b>%1</b>另外，射击己方刺猬损失<b>%2</b>点血。 + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - <b>%1</b>个刺猬被<b>%2</b>己方的刺猬误伤. - - + + <b>%1</b>个刺猬被<b>%2</b>己方的刺猬误伤. + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - <b>%1</b>被迫跳过<b>%2</b>回合。 + + <b>%1</b>被迫跳过<b>%2</b>回合。 + diff -r 4e3942f5827c -r 6acd599eee52 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun Nov 07 19:59:34 2010 +0300 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Sun Nov 07 20:08:33 2010 +0300 @@ -369,17 +369,23 @@ - + <b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts. - - - + + + + + <b>%1</b> killed <b>%2</b> of his own hedgehogs. - - - + + + + + <b>%1</b> was scared and skipped turn <b>%2</b> times. - + + +