# HG changeset patch # User unc0rr # Date 1225042773 0 # Node ID b510f7a74ef69b4b9dbacf022fdc41bf65e84c38 # Parent b80048899fa7d6260a66eb10c600a37529e54011 Add 'Divide teams' option to frontend diff -r b80048899fa7 -r b510f7a74ef6 QTfrontend/gamecfgwidget.cpp --- a/QTfrontend/gamecfgwidget.cpp Sun Oct 26 17:23:04 2008 +0000 +++ b/QTfrontend/gamecfgwidget.cpp Sun Oct 26 17:39:33 2008 +0000 @@ -40,44 +40,56 @@ mainLayout.addWidget(GBoxOptions); QGridLayout *GBoxOptionsLayout = new QGridLayout(GBoxOptions); + CB_mode_Forts = new QCheckBox(GBoxOptions); CB_mode_Forts->setText(QCheckBox::tr("Forts mode")); GBoxOptionsLayout->addWidget(CB_mode_Forts, 0, 0, 1, 2); + CB_teamsDivide = new QCheckBox(GBoxOptions); + CB_teamsDivide->setText(QCheckBox::tr("Divide teams")); + GBoxOptionsLayout->addWidget(CB_teamsDivide, 1, 0, 1, 2); + L_TurnTime = new QLabel(QLabel::tr("Turn time"), GBoxOptions); L_InitHealth = new QLabel(QLabel::tr("Initial health"), GBoxOptions); - GBoxOptionsLayout->addWidget(L_TurnTime, 1, 0); - GBoxOptionsLayout->addWidget(L_InitHealth, 2, 0); - GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Weapons"), GBoxOptions), 3, 0); + GBoxOptionsLayout->addWidget(L_TurnTime, 2, 0); + GBoxOptionsLayout->addWidget(L_InitHealth, 3, 0); + GBoxOptionsLayout->addWidget(new QLabel(QLabel::tr("Weapons"), GBoxOptions), 4, 0); SB_TurnTime = new QSpinBox(GBoxOptions); - SB_TurnTime->setRange(15, 90); + SB_TurnTime->setRange(5, 90); SB_TurnTime->setValue(45); SB_TurnTime->setSingleStep(15); + SB_InitHealth = new QSpinBox(GBoxOptions); SB_InitHealth->setRange(50, 200); SB_InitHealth->setValue(100); SB_InitHealth->setSingleStep(25); - GBoxOptionsLayout->addWidget(SB_TurnTime, 1, 1); - GBoxOptionsLayout->addWidget(SB_InitHealth, 2, 1); + GBoxOptionsLayout->addWidget(SB_TurnTime, 2, 1); + GBoxOptionsLayout->addWidget(SB_InitHealth, 3, 1); + WeaponsName = new QComboBox(GBoxOptions); - GBoxOptionsLayout->addWidget(WeaponsName, 3, 1); + GBoxOptionsLayout->addWidget(WeaponsName, 4, 1); - connect(SB_InitHealth, SIGNAL(valueChanged(int)), this, SLOT(onInitHealthChanged(int))); - connect(SB_TurnTime, SIGNAL(valueChanged(int)), this, SLOT(onTurnTimeChanged(int))); - connect(CB_mode_Forts, SIGNAL(toggled(bool)), this, SLOT(onFortsModeChanged(bool))); + connect(SB_InitHealth, SIGNAL(valueChanged(int)), this, SIGNAL(initHealthChanged(int))); + connect(SB_TurnTime, SIGNAL(valueChanged(int)), this, SIGNAL(turnTimeChanged(int))); + connect(CB_mode_Forts, SIGNAL(toggled(bool)), this, SIGNAL(fortsModeChanged(bool))); + connect(CB_teamsDivide, SIGNAL(toggled(bool)), this, SIGNAL(teamsDivideChanged(bool))); connect(WeaponsName, SIGNAL(activated(const QString&)), this, SIGNAL(newWeaponsName(const QString&))); - connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SLOT(onSeedChanged(const QString &))); - connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SLOT(onThemeChanged(const QString &))); - connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SLOT(onMapChanged(const QString &))); + connect(pMapContainer, SIGNAL(seedChanged(const QString &)), this, SIGNAL(seedChanged(const QString &))); + connect(pMapContainer, SIGNAL(mapChanged(const QString &)), this, SIGNAL(mapChanged(const QString &))); + connect(pMapContainer, SIGNAL(themeChanged(const QString &)), this, SIGNAL(themeChanged(const QString &))); } quint32 GameCFGWidget::getGameFlags() const { quint32 result = 0; + if (CB_mode_Forts->isChecked()) result |= 1; + if (CB_teamsDivide->isChecked()) + result |= 1; + return result; } @@ -139,12 +151,12 @@ pMapContainer->setTheme(theme); } -void GameCFGWidget::setInitHealth(quint32 health) +void GameCFGWidget::setInitHealth(int health) { SB_InitHealth->setValue(health); } -void GameCFGWidget::setTurnTime(quint32 time) +void GameCFGWidget::setTurnTime(int time) { SB_TurnTime->setValue(time); } @@ -154,34 +166,9 @@ CB_mode_Forts->setChecked(value); } -void GameCFGWidget::onInitHealthChanged(int health) -{ - emit initHealthChanged(health); -} - -void GameCFGWidget::onTurnTimeChanged(int time) -{ - emit turnTimeChanged(time); -} - -void GameCFGWidget::onFortsModeChanged(bool value) +void GameCFGWidget::setTeamsDivide(bool value) { - emit fortsModeChanged(value); -} - -void GameCFGWidget::onSeedChanged(const QString & seed) -{ - emit seedChanged(seed); -} - -void GameCFGWidget::onMapChanged(const QString & map) -{ - emit mapChanged(map); -} - -void GameCFGWidget::onThemeChanged(const QString & theme) -{ - emit themeChanged(theme); + CB_teamsDivide->setChecked(value); } void GameCFGWidget::setNetAmmo(const QString& name, const QString& ammo) diff -r b80048899fa7 -r b510f7a74ef6 QTfrontend/gamecfgwidget.h --- a/QTfrontend/gamecfgwidget.h Sun Oct 26 17:23:04 2008 +0000 +++ b/QTfrontend/gamecfgwidget.h Sun Oct 26 17:39:33 2008 +0000 @@ -52,22 +52,25 @@ void setSeed(const QString & seed); void setMap(const QString & map); void setTheme(const QString & theme); - void setInitHealth(quint32 health); - void setTurnTime(quint32 time); + void setInitHealth(int health); + void setTurnTime(int time); void setFortsMode(bool value); + void setTeamsDivide(bool value); void setNetAmmo(const QString& name, const QString& ammo); signals: void seedChanged(const QString & seed); void mapChanged(const QString & map); void themeChanged(const QString & theme); - void initHealthChanged(quint32 health); - void turnTimeChanged(quint32 time); + void initHealthChanged(int health); + void turnTimeChanged(int time); void fortsModeChanged(bool value); + void teamsDivideChanged(bool value); void newWeaponsName(const QString& weapon); private: QCheckBox * CB_mode_Forts; + QCheckBox * CB_teamsDivide; QGridLayout mainLayout; HWMapContainer* pMapContainer; QSpinBox * SB_TurnTime; @@ -77,15 +80,6 @@ QString curNetAmmoName; QString curNetAmmo; - -private slots: - void onSeedChanged(const QString & seed); - void onMapChanged(const QString & map); - void onThemeChanged(const QString & theme); - void onInitHealthChanged(int health); - void onTurnTimeChanged(int time); - void onFortsModeChanged(bool value); - }; #endif // GAMECONFIGWIDGET_H diff -r b80048899fa7 -r b510f7a74ef6 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sun Oct 26 17:23:04 2008 +0000 +++ b/QTfrontend/hwform.cpp Sun Oct 26 17:39:33 2008 +0000 @@ -490,17 +490,19 @@ connect(ui.pageNetGame->pGameCFG, SIGNAL(seedChanged(const QString &)), hwnet, SLOT(onSeedChanged(const QString &))); connect(ui.pageNetGame->pGameCFG, SIGNAL(mapChanged(const QString &)), hwnet, SLOT(onMapChanged(const QString &))); connect(ui.pageNetGame->pGameCFG, SIGNAL(themeChanged(const QString &)), hwnet, SLOT(onThemeChanged(const QString &))); - connect(ui.pageNetGame->pGameCFG, SIGNAL(initHealthChanged(quint32)), hwnet, SLOT(onInitHealthChanged(quint32))); - connect(ui.pageNetGame->pGameCFG, SIGNAL(turnTimeChanged(quint32)), hwnet, SLOT(onTurnTimeChanged(quint32))); + connect(ui.pageNetGame->pGameCFG, SIGNAL(initHealthChanged(int)), hwnet, SLOT(onInitHealthChanged(int))); + connect(ui.pageNetGame->pGameCFG, SIGNAL(turnTimeChanged(int)), hwnet, SLOT(onTurnTimeChanged(int))); connect(ui.pageNetGame->pGameCFG, SIGNAL(fortsModeChanged(bool)), hwnet, SLOT(onFortsModeChanged(bool))); + connect(ui.pageNetGame->pGameCFG, SIGNAL(teamsDivideChanged(bool)), hwnet, SLOT(onTeamsDivideChanged(bool))); connect(hwnet, SIGNAL(Disconnected()), this, SLOT(ForcedDisconnect())); connect(hwnet, SIGNAL(seedChanged(const QString &)), ui.pageNetGame->pGameCFG, SLOT(setSeed(const QString &))); connect(hwnet, SIGNAL(mapChanged(const QString &)), ui.pageNetGame->pGameCFG, SLOT(setMap(const QString &))); connect(hwnet, SIGNAL(themeChanged(const QString &)), ui.pageNetGame->pGameCFG, SLOT(setTheme(const QString &))); - connect(hwnet, SIGNAL(initHealthChanged(quint32)), ui.pageNetGame->pGameCFG, SLOT(setInitHealth(quint32))); - connect(hwnet, SIGNAL(turnTimeChanged(quint32)), ui.pageNetGame->pGameCFG, SLOT(setTurnTime(quint32))); + connect(hwnet, SIGNAL(initHealthChanged(int)), ui.pageNetGame->pGameCFG, SLOT(setInitHealth(int))); + connect(hwnet, SIGNAL(turnTimeChanged(int)), ui.pageNetGame->pGameCFG, SLOT(setTurnTime(int))); connect(hwnet, SIGNAL(fortsModeChanged(bool)), ui.pageNetGame->pGameCFG, SLOT(setFortsMode(bool))); + connect(hwnet, SIGNAL(teamsDivideChanged(bool)), ui.pageNetGame->pGameCFG, SLOT(setTeamsDivide(bool))); connect(hwnet, SIGNAL(hhnumChanged(const HWTeam&)), ui.pageNetGame->pNetTeamsWidget, SLOT(changeHHNum(const HWTeam&))); connect(hwnet, SIGNAL(teamColorChanged(const HWTeam&)), diff -r b80048899fa7 -r b510f7a74ef6 QTfrontend/newnetclient.cpp --- a/QTfrontend/newnetclient.cpp Sun Oct 26 17:23:04 2008 +0000 +++ b/QTfrontend/newnetclient.cpp Sun Oct 26 17:39:33 2008 +0000 @@ -385,6 +385,10 @@ emit fortsModeChanged(lst[2].toInt() != 0); return; } + if (lst[1] == "DIVIDETEAMS") { + emit teamsDivideChanged(lst[2].toInt() != 0); + return; + } if (lst[1] == "AMMO") { if(lst.size() < 4) return; emit ammoChanged(lst[3], lst[2]); @@ -486,12 +490,12 @@ if (isChief) RawSendNet(QString("CONFIG_PARAM%1THEME%1%2").arg(delimeter).arg(theme)); } -void HWNewNet::onInitHealthChanged(quint32 health) +void HWNewNet::onInitHealthChanged(int health) { if (isChief) RawSendNet(QString("CONFIG_PARAM%1HEALTH%1%2").arg(delimeter).arg(health)); } -void HWNewNet::onTurnTimeChanged(quint32 time) +void HWNewNet::onTurnTimeChanged(int time) { if (isChief) RawSendNet(QString("CONFIG_PARAM%1TURNTIME%1%2").arg(delimeter).arg(time)); } @@ -501,6 +505,11 @@ if (isChief) RawSendNet(QString("CONFIG_PARAM%1FORTSMODE%1%2").arg(delimeter).arg(value)); } +void HWNewNet::onTeamsDivideChanged(bool value) +{ + if (isChief) RawSendNet(QString("CONFIG_PARAM%1DIVIDETEAMS%1%2").arg(delimeter).arg(value)); +} + void HWNewNet::onWeaponsNameChanged(const QString& name, const QString& ammo) { if (isChief) RawSendNet(QString("CONFIG_PARAM%1AMMO%1%2%1%3").arg(delimeter).arg(ammo).arg(name)); diff -r b80048899fa7 -r b510f7a74ef6 QTfrontend/newnetclient.h --- a/QTfrontend/newnetclient.h Sun Oct 26 17:23:04 2008 +0000 +++ b/QTfrontend/newnetclient.h Sun Oct 26 17:39:33 2008 +0000 @@ -99,9 +99,10 @@ void seedChanged(const QString & seed); void mapChanged(const QString & map); void themeChanged(const QString & theme); - void initHealthChanged(quint32 health); - void turnTimeChanged(quint32 time); + void initHealthChanged(int health); + void turnTimeChanged(int time); void fortsModeChanged(bool value); + void teamsDivideChanged(bool value); void hhnumChanged(const HWTeam&); void teamColorChanged(const HWTeam&); void chatStringFromNet(const QString&); @@ -122,9 +123,10 @@ void onSeedChanged(const QString & seed); void onMapChanged(const QString & map); void onThemeChanged(const QString & theme); - void onInitHealthChanged(quint32 health); - void onTurnTimeChanged(quint32 time); + void onInitHealthChanged(int health); + void onTurnTimeChanged(int time); void onFortsModeChanged(bool value); + void onTeamsDivideChanged(bool value); void onHedgehogsNumChanged(const HWTeam& team); void onTeamColorChanged(const HWTeam& team); void onWeaponsNameChanged(const QString& name, const QString& ammo); diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_bg.qm Binary file share/hedgewars/Data/Locale/hedgewars_bg.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sun Oct 26 17:39:33 2008 +0000 @@ -26,7 +26,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Грешка</translation> </message> @@ -51,12 +51,12 @@ <translation>Изберете запис от списъка</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Грешка при запис във файл %1</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Грешка при стартиране на сървъра</translation> </message> @@ -521,7 +521,7 @@ <translation>Пълен екран</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Режим фортове</translation> </message> @@ -545,6 +545,11 @@ <source>Frontend fullscreen</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -647,7 +652,7 @@ <translation type="obsolete">Игрови настройки</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Играещи отбори</translation> </message> @@ -740,22 +745,22 @@ <translation type="obsolete"><h2></h2><p></p></translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Време за ход</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Начално здраве</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Награда за най-добър изстрел е спечелена от <b>%1</b> с <b>%2</b> точки.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>По време на този рунд бяха убити <b>%1</b> таралежи.</p></translation> </message> @@ -790,7 +795,7 @@ <translation>Преводи:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Специална благодарност:</translation> </message> @@ -815,7 +820,7 @@ <translation>Порт:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Оръжия</translation> </message> @@ -830,7 +835,7 @@ <translation>Версия</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation type="unfinished"></translation> </message> @@ -864,12 +869,12 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -878,12 +883,12 @@ Проверете инсталацията си</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Мрежа</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Загубена е връзка със сървъра</translation> </message> @@ -954,7 +959,7 @@ <translation type="obsolete">Демота</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Настройка</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_cs.qm Binary file share/hedgewars/Data/Locale/hedgewars_cs.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sun Oct 26 17:39:33 2008 +0000 @@ -16,7 +16,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -31,12 +31,12 @@ <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Není možné spustit server</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Není možné uložit záznam do souboru %1</translation> </message> @@ -422,7 +422,7 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Režim pevností</translation> </message> @@ -456,6 +456,11 @@ <source>Enable music</source> <translation>Povolit hudbu</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -573,7 +578,7 @@ <translation>Síťová hra</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Hrající teamy</translation> </message> @@ -606,32 +611,32 @@ <translation>Překlady:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Speciální poděkování:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Délka tahu</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Úvodní zdraví:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Zbraně</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Ocenění za nejlepší zásah vyhrál(a) <b>%1</b> s <b>%2</b> body.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Celkem bylo zabito <b>%1</b> ježků v tomto kole.</p></translation> </message> @@ -676,7 +681,7 @@ <translation type="obsolete"><h3>Wersja 0.9.3</h3></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Ocenění za nejlepší zásah získal(a) <b>%1</b>, zabil při něm <b>%2</b> nepřátelských ježků.</p></translation> </message> @@ -710,22 +715,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Síť</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Spojení se serverem bylo ztraceno</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -860,7 +865,7 @@ <translation>Načíst</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Nastavení</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_de.qm Binary file share/hedgewars/Data/Locale/hedgewars_de.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sun Oct 26 17:39:33 2008 +0000 @@ -3,7 +3,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Fehler</translation> </message> @@ -18,12 +18,12 @@ <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Server konnte nicht gestartet werden</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Datei %1 konnte nicht gespeichert werden</translation> </message> @@ -409,7 +409,7 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Festungs-Modus</translation> </message> @@ -443,6 +443,11 @@ <source>Frontend fullscreen</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -560,7 +565,7 @@ <translation>Netzwerkspiel</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Spielende Teams</translation> </message> @@ -593,32 +598,32 @@ <translation>Übersetzer:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Besonderer Dank geht an:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Rundenzeit</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Lebenspunkte-Startwert</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Waffen</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Der Preis für den besten Schuss geht an <b>%1</b> mit <b>%2</b> Punkten.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Insgesamt wurden <b>%1</b> Igel während dieser Runde getötet.</p></translation> </message> @@ -663,7 +668,7 @@ <translation type="obsolete"><h3>Version 0.9.3</h3></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Der Preis für den besten Schuss geht an <b>%1</b> mit <b>%2</b> Kills.</p></translation> </message> @@ -697,22 +702,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Verbindung zum Server wurde unterbrochen</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -847,7 +852,7 @@ <translation>Laden</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Einstellungen</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_fr.qm Binary file share/hedgewars/Data/Locale/hedgewars_fr.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sun Oct 26 17:39:33 2008 +0000 @@ -26,7 +26,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Erreur</translation> </message> @@ -51,12 +51,12 @@ <translation>S'il vous plait, choisissez une partie dans la liste ci-dessus</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Impossible de sauver la partie dans le fichier %1</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Impossible de démarrer le serveur</translation> </message> @@ -521,7 +521,7 @@ <translation>Plein écran</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Mode forts</translation> </message> @@ -545,6 +545,11 @@ <source>Frontend fullscreen</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -647,7 +652,7 @@ <translation type="obsolete">Paramètres de jeu</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Équipes participantes</translation> </message> @@ -740,22 +745,22 @@ <translation type="obsolete"><h2></h2><p></p></translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Temps du tour</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Vie initiale</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Le prix du meilleur tir revient à <b>%1</b> avec <b>%2</b> points.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Un total de <b>%1</b> Hérisson(s) ont été tués pendant ce round.</p></translation> </message> @@ -790,7 +795,7 @@ <translation>Traductions:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Remerciements spéciaux:</translation> </message> @@ -815,7 +820,7 @@ <translation>Port:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Armes</translation> </message> @@ -830,7 +835,7 @@ <translation>Version</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Le prix du meilleur tir revient à <br>%1</b> avec <b>%2</b> morts.</p></translation> </message> @@ -864,12 +869,12 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -878,12 +883,12 @@ Vérifier votre installation</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>La connexion au serveur à été perdue</translation> </message> @@ -954,7 +959,7 @@ <translation type="obsolete">Демки</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Configuration</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_it.qm Binary file share/hedgewars/Data/Locale/hedgewars_it.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sun Oct 26 17:39:33 2008 +0000 @@ -3,7 +3,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Errore</translation> </message> @@ -18,12 +18,12 @@ <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Impossibile avviare il server</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Impossibile salvare il record al file %1</translation> </message> @@ -409,7 +409,7 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Modalità Fortino</translation> </message> @@ -443,6 +443,11 @@ <source>Frontend fullscreen</source> <translation>Frontend schermo intero</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -560,7 +565,7 @@ <translation>Gioco in rete</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Squadre in gioco</translation> </message> @@ -593,32 +598,32 @@ <translation>Traduzioni:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Ringraziamenti speciali:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Tempo del turno</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Salute iniziale</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Armi</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Il premio per il miglior colpo è vinto da <b>%1</b> , con <b>%2</b> punti.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Un totale di <b>%1</b> Hedgehog(s) sono stati uccisi durante questo round.</p></translation> </message> @@ -663,7 +668,7 @@ <translation>Versione</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Il premio per il miglior colpo è stato vinto da <b>%1</b> con <b>%2</b> hedgehog uccisi.</p></translation> </message> @@ -692,22 +697,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Rete</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Connessione con il server persa</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -842,7 +847,7 @@ <translation>Carica</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Impostazioni</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_pl.qm Binary file share/hedgewars/Data/Locale/hedgewars_pl.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sun Oct 26 17:39:33 2008 +0000 @@ -3,7 +3,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Błąd</translation> </message> @@ -18,12 +18,12 @@ <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Nie można uruchomić serwera</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Nie można zapisać nagrania do pliku %1</translation> </message> @@ -409,7 +409,7 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Tryb fortów</translation> </message> @@ -443,6 +443,11 @@ <source>Frontend fullscreen</source> <translation>Pełnoekranowe menu</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -560,7 +565,7 @@ <translation>Gra sieciowa</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Grające drużyny</translation> </message> @@ -593,32 +598,32 @@ <translation>Tłumaczenia:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Szczególne podziękowania:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Czas trwania tury</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Punkty życia</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Uzbrojenie</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Odznaczenie za najlepszy strzał przyznano <b>%1</b>, zadał on <b>%2</b> punktów obrażeń.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Łącznie, <b>%1</b> jeży zostało zabitych w czasie tej walki.</p></translation> </message> @@ -663,7 +668,7 @@ <translation type="obsolete"><h3>Wersja 0.9.3</h3></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Odznaczenie za najlepszy strzał otrzymuje <b>%1</b>, zabijając nim <b>%2</b> przeciwników.</p></translation> </message> @@ -697,22 +702,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Sieć</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Połączenie z serwerem zostało przerwane</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -847,7 +852,7 @@ <translation>Wczytaj</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Ustawienia</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_pt_BR.qm Binary file share/hedgewars/Data/Locale/hedgewars_pt_BR.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sun Oct 26 17:39:33 2008 +0000 @@ -3,7 +3,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Erro</translation> </message> @@ -18,12 +18,12 @@ <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation type="unfinished">Falha ao iniciar o servidor</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Falha ao salvar o recorde no arquivo %1</translation> </message> @@ -409,7 +409,7 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Modo de Fortes</translation> </message> @@ -443,6 +443,11 @@ <source>Frontend fullscreen</source> <translation>Interface em tela cheia</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -560,7 +565,7 @@ <translation>Jogo em ree</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Equipes em jogo</translation> </message> @@ -593,32 +598,32 @@ <translation type="unfinished">Traduções:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation type="unfinished">Agradecimentos especiais:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Duração do turno</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Vida inicial</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Armas</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>O prêmio de melhor disparo foi ganho por <b>%1</b> , com <b>%2</b> pontos.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Um total de <b>%1</b> porco(s) espinho foram mortos durante esta rodada.</p></translation> </message> @@ -663,7 +668,7 @@ <translation>Versão</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>O prêmio de melhor disparo foi ganho por <b>%1</b> com <b>%2</b> mortes.</p></translation> </message> @@ -692,22 +697,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation type="unfinished">A conexão com o servidor foi perdida</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -842,7 +847,7 @@ <translation type="unfinished">Carregar</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Configuração</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_ru.qm Binary file share/hedgewars/Data/Locale/hedgewars_ru.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sun Oct 26 17:39:33 2008 +0000 @@ -1,24 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS><TS version="1.1" language="ru"> +<defaultcodec></defaultcodec> <context> <name>GameUIConfig</name> <message> - <location filename="" line="0"/> <source>Error</source> <translation type="obsolete">Ошибка</translation> </message> <message> - <location filename="" line="0"/> <source>Cannot create directory %1</source> <translation type="obsolete">Не могу создать папку %1</translation> </message> <message> - <location filename="" line="0"/> <source>Quit</source> <translation type="obsolete">Выйти</translation> </message> <message> - <location filename="" line="0"/> <source>Cannot save options to file %1</source> <translation type="obsolete">Ошибка при сохранении настроек в файл %1</translation> </message> @@ -39,12 +36,11 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="" line="0"/> <source>Please, select demo from the list above</source> <translation type="obsolete">Выберите демо из списка</translation> </message> @@ -54,7 +50,6 @@ <translation>ОК</translation> </message> <message> - <location filename="" line="0"/> <source>Please, select server from the list above</source> <translation type="obsolete">Выберите сервер из списка</translation> </message> @@ -64,12 +59,12 @@ <translation>Выберите запись из списка</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Не могу сохранить запись в файл %1</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Ошибка запуска сервера</translation> </message> @@ -77,12 +72,10 @@ <context> <name>HWGame</name> <message> - <location filename="" line="0"/> <source>Error</source> <translation type="obsolete">Ошибка</translation> </message> <message> - <location filename="" line="0"/> <source>Unable to start the server: %1.</source> <translation type="obsolete">Ошибка запуска сервера: %1.</translation> </message> @@ -92,12 +85,10 @@ <translation>ru.txt</translation> </message> <message> - <location filename="" line="0"/> <source>Cannot save demo to file %1</source> <translation type="obsolete">Ошибка сохранения демо в файл %1</translation> </message> <message> - <location filename="" line="0"/> <source>Quit</source> <translation type="obsolete">Выход</translation> </message> @@ -107,7 +98,6 @@ <translation>Не могу открыть демо %1</translation> </message> <message> - <location filename="" line="0"/> <source>Unable to run engine: %1 (</source> <translation type="obsolete">Ошибка запуска движка: %1 (</translation> </message> @@ -133,17 +123,14 @@ <context> <name>HWNet</name> <message> - <location filename="" line="0"/> <source>Error</source> <translation type="obsolete">Ошибка</translation> </message> <message> - <location filename="" line="0"/> <source>The host was not found. Please check the host name and port settings.</source> <translation type="obsolete">Ошибка подключения. Проверьте имя сервера и номер порта.</translation> </message> <message> - <location filename="" line="0"/> <source>Connection refused</source> <translation type="obsolete">Отказано в соединении</translation> </message> @@ -151,12 +138,10 @@ <context> <name>HWNetServer</name> <message> - <location filename="" line="0"/> <source>Error</source> <translation type="obsolete">Ошибка</translation> </message> <message> - <location filename="" line="0"/> <source>Unable to start the server: %1.</source> <translation type="obsolete">Ошибка запуска сервера: %1.</translation> </message> @@ -534,7 +519,7 @@ <translation>Полный экран</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Режим фортов</translation> </message> @@ -558,6 +543,11 @@ <source>Frontend fullscreen</source> <translation>Полноэкранный фронтенд</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation>Разделить команды</translation> + </message> </context> <context> <name>QComboBox</name> @@ -640,7 +630,6 @@ <translation>Настройки звука и графики</translation> </message> <message> - <location filename="" line="0"/> <source>Net nick</source> <translation type="obsolete">Имя игрока</translation> </message> @@ -660,7 +649,7 @@ <translation type="obsolete">Настройки игры</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Команды в игре</translation> </message> @@ -693,27 +682,22 @@ <translation>Имя игрока</translation> </message> <message> - <location filename="" line="0"/> <source>Server address</source> <translation type="obsolete">Адрес сервера</translation> </message> <message> - <location filename="" line="0"/> <source><div align="center"><h1>Hedgewars</h1><h3>Version 0.8</h3><p><a href="http://www.hedgewars.org/">http://www.hedgewars.org/</a></p><br>This program is distributed under the GNU General Public License</div></source> <translation type="obsolete"><div align="center"><h1>Hedgewars</h1><h3>Версия 0.8</h3><p><a href="http://www.hedgewars.org/">http://www.hedgewars.org/</a></p><br>Эта программа распространяется под лицензией GNU (the GNU General Public License)</div></translation> </message> <message> - <location filename="" line="0"/> <source><h2>Developers:</h2><p>Andrey Korotaev &lt;<a href="mailto:unC0Rr@gmail.com">unC0Rr@gmail.com</a>&gt;<br>Igor Ulyanov &lt;<a href="mailto:iulyanov@gmail.com">iulyanov@gmail.com</a>&gt;</p><h2>Translations:</h2>english: Andrey Korotaev &lt;<a href="mailto:unC0Rr@gmail.com">unC0Rr@gmail.com</a>&gt;<br>russian: Andrey Korotaev &lt;<a href="mailto:unC0Rr@gmail.com">unC0Rr@gmail.com</a>&gt;</source> <translation type="obsolete"><h2>Разработчики:</h2><p>Андрей Коротаев &lt;<a href="mailto:unC0Rr@gmail.com">unC0Rr@gmail.com</a>&gt;<br>Игорь Ульянов &lt;<a href="mailto:iulyanov@gmail.com">iulyanov@gmail.com</a>&gt;</p><h2>Перевод:</h2>английский: Андрей Коротаев &lt;<a href="mailto:unC0Rr@gmail.com">unC0Rr@gmail.com</a>&gt;<br>русский: Андрей Коротаев &lt;<a href="mailto:unC0Rr@gmail.com">unC0Rr@gmail.com</a>&gt;</translation> </message> <message> - <location filename="" line="0"/> <source>difficulty:</source> <translation type="obsolete">Уровень игры:</translation> </message> <message> - <location filename="" line="0"/> <source><h3>Version 0.8</h3></source> <translation type="obsolete"><h3>Версия 0.8</h3></translation> </message> @@ -723,57 +707,50 @@ <translation>Эта программа распространяется на условиях лицензии GNU (the GNU General Public License)</translation> </message> <message> - <location filename="" line="0"/> <source><h2>Translations:</h2></source> <translation type="obsolete"><h2>Переводы:</h2></translation> </message> <message> - <location filename="" line="0"/> <source><h2>Developers:</h2></source> <translation type="obsolete"><h2>Разработчики:</h2></translation> </message> <message> - <location filename="" line="0"/> <source><h2>Translations:</h2><p></source> <translation type="obsolete"><h2>Переводы:</h2><p></translation> </message> <message> - <location filename="" line="0"/> <source><h2>Special thanks:</h2><p></source> <translation type="obsolete"><h2>Особая благодарность:</h2><p></translation> </message> <message> - <location filename="" line="0"/> <source><h3>Version 0.8.1</h3></source> <translation type="obsolete"><h3>Версия 0.8.1</h3></translation> </message> <message> - <location filename="" line="0"/> <source><h2></h2><p></p></source> <translation type="obsolete"><h2></h2><p></p></translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Продолжительность хода</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Начальный уровень здоровья</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Приз за лучший выстрел получает <b>%1</b> с <b>%2</b> пунктами урона.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>За этот раунд было убито <b>%1</b> ежей.</p></translation> </message> <message> - <location filename="" line="0"/> <source><h3>Version 0.9</h3></source> <translation type="obsolete"><h3>Версия 0.9</h3></translation> </message> @@ -803,7 +780,7 @@ <translation>Переводы:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Особая благодарность:</translation> </message> @@ -828,7 +805,7 @@ <translation>Порт:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Оружие</translation> </message> @@ -843,7 +820,7 @@ <translation>Версия</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Приз за лучший выстрел получает <b>%1</b> с <b>%2</b> поверженными врагами.</p></translation> </message> @@ -864,7 +841,6 @@ <context> <name>QMainWindow</name> <message> - <location filename="" line="0"/> <source>-= by unC0Rr =-</source> <translation type="obsolete">-= by unC0Rr =-</translation> </message> @@ -877,12 +853,12 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -891,12 +867,12 @@ Проверьте правильность установки</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Соединение с сервером потеряно</translation> </message> @@ -934,7 +910,6 @@ <translation>Не могу создать папку %1</translation> </message> <message> - <location filename="" line="0"/> <source>Quit</source> <translation type="obsolete">Выйти</translation> </message> @@ -952,27 +927,23 @@ <translation type="obsolete">Одиночная игра</translation> </message> <message> - <location filename="" line="0"/> <source>Multiplayer</source> <translation type="obsolete">Схватка</translation> </message> <message> - <location filename="" line="0"/> <source>Net game</source> <translation type="obsolete">Сетевая игра</translation> </message> <message> - <location filename="" line="0"/> <source>Demos</source> <translation type="obsolete">Демки</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Настройка</translation> </message> <message> - <location filename="" line="0"/> <source>Exit</source> <translation type="obsolete">Выход</translation> </message> @@ -987,12 +958,10 @@ <translation type="obsolete">Быстрый старт</translation> </message> <message> - <location filename="" line="0"/> <source>Discard</source> <translation type="obsolete">Отменить</translation> </message> <message> - <location filename="" line="0"/> <source>Save</source> <translation type="obsolete">Сохранить</translation> </message> @@ -1002,12 +971,10 @@ <translation>Играть демку</translation> </message> <message> - <location filename="" line="0"/> <source>New team</source> <translation type="obsolete">Новая команда</translation> </message> <message> - <location filename="" line="0"/> <source>Edit team</source> <translation type="obsolete">Изменить</translation> </message> @@ -1017,22 +984,18 @@ <translation>Соединить</translation> </message> <message> - <location filename="" line="0"/> <source>Disconnect</source> <translation type="obsolete">Разъединить</translation> </message> <message> - <location filename="" line="0"/> <source>Join</source> <translation type="obsolete">Присоединиться</translation> </message> <message> - <location filename="" line="0"/> <source>Create</source> <translation type="obsolete">Создать</translation> </message> <message> - <location filename="" line="0"/> <source>Add Team</source> <translation type="obsolete">Добавить команду</translation> </message> @@ -1047,7 +1010,6 @@ <translation>Старт</translation> </message> <message> - <location filename="" line="0"/> <source>About</source> <translation type="obsolete">О программе</translation> </message> @@ -1072,7 +1034,6 @@ <translation>Загрузить</translation> </message> <message> - <location filename="" line="0"/> <source>Weapons scheme</source> <translation type="obsolete">Схема оружия</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_sk.qm Binary file share/hedgewars/Data/Locale/hedgewars_sk.qm has changed diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sun Oct 26 17:39:33 2008 +0000 @@ -3,7 +3,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -18,12 +18,12 @@ <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Nie je možné spustiť server</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Nie je možné zapísať záznam do súboru %1</translation> </message> @@ -409,7 +409,7 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Režim pevností</translation> </message> @@ -443,6 +443,11 @@ <source>Enable music</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -560,7 +565,7 @@ <translation>Sieťová hra</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Hrajúce teamy</translation> </message> @@ -593,32 +598,32 @@ <translation>Preklady:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Osobitné poďakovanie:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Čas na ťah</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Úvodné zdravie</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Výzbroj</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Ocenenie za najlepší zásah vyhral(a) <b>%1</b> (<b>%2</b> bodov).</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>Celkovo bolo zabitých <b>%1</b> ježkov počas tohto kola.</p></translation> </message> @@ -663,7 +668,7 @@ <translation type="obsolete"><h3>Wersja 0.9.3</h3></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Ocenenie za najlepší zásah získal(a) <b>%1</b>, zabil ním <b>%2</b> nepriateľov.</p></translation> </message> @@ -697,22 +702,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Sieť</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Spojenie so serverom bolo prerušené</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -847,7 +852,7 @@ <translation>Načítať</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Nastavenie</translation> </message> diff -r b80048899fa7 -r b510f7a74ef6 share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Oct 26 17:23:04 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sun Oct 26 17:39:33 2008 +0000 @@ -26,7 +26,7 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="536"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Помилка</translation> </message> @@ -51,12 +51,12 @@ <translation>Виберіть запис зі списку</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="715"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Не можу зберегти запис до файлу %1</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="537"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Помилка при запущенні сервера</translation> </message> @@ -521,7 +521,7 @@ <translation>Повний екран</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="44"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Режим фортів</translation> </message> @@ -545,6 +545,11 @@ <source>Frontend fullscreen</source> <translation>Фронтенд на повний екран</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> @@ -647,7 +652,7 @@ <translation type="obsolete">Настройки гри</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Команди в грі</translation> </message> @@ -740,22 +745,22 @@ <translation type="obsolete"><h2></h2><p></p></translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="47"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Тривалість ходу</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="48"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Початковий рівень здоров'я</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="659"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="661"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p></source> <translation><p>Нагороду за кращий постріл отримує <b>%1</b> з <b>%2</b> пунктами урону.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="671"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="673"/> <source><p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p></source> <translation><p>За цей раунд було вбито <b>%1</b> їжаків.</p></translation> </message> @@ -790,7 +795,7 @@ <translation>Переклади:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="92"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Особлива вдячність:</translation> </message> @@ -815,7 +820,7 @@ <translation>Порт:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Зброя</translation> </message> @@ -830,7 +835,7 @@ <translation>Версія</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="666"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="668"/> <source><p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p></source> <translation><p>Нагороду за кращий постріл отримує <b>%1</b> з <b>%2</b> вбитими ворогами.</p></translation> </message> @@ -864,12 +869,12 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/main.cpp" line="301"/> + <location filename="../../../../QTfrontend/main.cpp" line="307"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="304"/> + <location filename="../../../../QTfrontend/main.cpp" line="310"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -878,12 +883,12 @@ Перевірте правильність установки</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="581"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Мережа</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="582"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>З'єднання з сервером загублено</translation> </message> @@ -954,7 +959,7 @@ <translation type="obsolete">Демки</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="225"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Налагодження</translation> </message>