# 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 @@ HWForm - + Error Грешка @@ -51,12 +51,12 @@ Изберете запис от списъка - + Cannot save record to file %1 Грешка при запис във файл %1 - + Unable to start the server Грешка при стартиране на сървъра @@ -521,7 +521,7 @@ Пълен екран - + Forts mode Режим фортове @@ -545,6 +545,11 @@ Frontend fullscreen + + + Divide teams + + QComboBox @@ -647,7 +652,7 @@ Игрови настройки - + Playing teams Играещи отбори @@ -740,22 +745,22 @@ <h2></h2><p></p> - + Turn time Време за ход - + Initial health Начално здраве - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Награда за най-добър изстрел е спечелена от <b>%1</b> с <b>%2</b> точки.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>По време на този рунд бяха убити <b>%1</b> таралежи.</p> @@ -790,7 +795,7 @@ Преводи: - + Special thanks: Специална благодарност: @@ -815,7 +820,7 @@ Порт: - + Weapons Оръжия @@ -830,7 +835,7 @@ Версия - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> @@ -864,12 +869,12 @@ QMessageBox - + Error Грешка - + Failed to open data directory: %1 Please check your installation @@ -878,12 +883,12 @@ Проверете инсталацията си - + Network Мрежа - + Connection to server is lost Загубена е връзка със сървъра @@ -954,7 +959,7 @@ Демота - + Setup Настройка 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 @@ HWForm - + Error Chyba @@ -31,12 +31,12 @@ OK - + Unable to start the server Není možné spustit server - + Cannot save record to file %1 Není možné uložit záznam do souboru %1 @@ -422,7 +422,7 @@ QCheckBox - + Forts mode Režim pevností @@ -456,6 +456,11 @@ Enable music Povolit hudbu + + + Divide teams + + QComboBox @@ -573,7 +578,7 @@ Síťová hra - + Playing teams Hrající teamy @@ -606,32 +611,32 @@ Překlady: - + Special thanks: Speciální poděkování: - + Turn time Délka tahu - + Initial health Úvodní zdraví: - + Weapons Zbraně - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Ocenění za nejlepší zásah vyhrál(a) <b>%1</b> s <b>%2</b> body.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Celkem bylo zabito <b>%1</b> ježků v tomto kole.</p> @@ -676,7 +681,7 @@ <h3>Wersja 0.9.3</h3> - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <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> @@ -710,22 +715,22 @@ QMessageBox - + Network Síť - + Connection to server is lost Spojení se serverem bylo ztraceno - + Error Chyba - + Failed to open data directory: %1 Please check your installation @@ -860,7 +865,7 @@ Načíst - + Setup Nastavení 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 @@ HWForm - + Error Fehler @@ -18,12 +18,12 @@ OK - + Unable to start the server Server konnte nicht gestartet werden - + Cannot save record to file %1 Datei %1 konnte nicht gespeichert werden @@ -409,7 +409,7 @@ QCheckBox - + Forts mode Festungs-Modus @@ -443,6 +443,11 @@ Frontend fullscreen + + + Divide teams + + QComboBox @@ -560,7 +565,7 @@ Netzwerkspiel - + Playing teams Spielende Teams @@ -593,32 +598,32 @@ Übersetzer: - + Special thanks: Besonderer Dank geht an: - + Turn time Rundenzeit - + Initial health Lebenspunkte-Startwert - + Weapons Waffen - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Der Preis für den besten Schuss geht an <b>%1</b> mit <b>%2</b> Punkten.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Insgesamt wurden <b>%1</b> Igel während dieser Runde getötet.</p> @@ -663,7 +668,7 @@ <h3>Version 0.9.3</h3> - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Der Preis für den besten Schuss geht an <b>%1</b> mit <b>%2</b> Kills.</p> @@ -697,22 +702,22 @@ QMessageBox - + Network Netzwerk - + Connection to server is lost Verbindung zum Server wurde unterbrochen - + Error Fehler - + Failed to open data directory: %1 Please check your installation @@ -847,7 +852,7 @@ Laden - + Setup Einstellungen 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 @@ HWForm - + Error Erreur @@ -51,12 +51,12 @@ S'il vous plait, choisissez une partie dans la liste ci-dessus - + Cannot save record to file %1 Impossible de sauver la partie dans le fichier %1 - + Unable to start the server Impossible de démarrer le serveur @@ -521,7 +521,7 @@ Plein écran - + Forts mode Mode forts @@ -545,6 +545,11 @@ Frontend fullscreen + + + Divide teams + + QComboBox @@ -647,7 +652,7 @@ Paramètres de jeu - + Playing teams Équipes participantes @@ -740,22 +745,22 @@ <h2></h2><p></p> - + Turn time Temps du tour - + Initial health Vie initiale - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Le prix du meilleur tir revient à <b>%1</b> avec <b>%2</b> points.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Un total de <b>%1</b> Hérisson(s) ont été tués pendant ce round.</p> @@ -790,7 +795,7 @@ Traductions: - + Special thanks: Remerciements spéciaux: @@ -815,7 +820,7 @@ Port: - + Weapons Armes @@ -830,7 +835,7 @@ Version - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Le prix du meilleur tir revient à <br>%1</b> avec <b>%2</b> morts.</p> @@ -864,12 +869,12 @@ QMessageBox - + Error Erreur - + Failed to open data directory: %1 Please check your installation @@ -878,12 +883,12 @@ Vérifier votre installation - + Network Réseau - + Connection to server is lost La connexion au serveur à été perdue @@ -954,7 +959,7 @@ Демки - + Setup Configuration 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 @@ HWForm - + Error Errore @@ -18,12 +18,12 @@ OK - + Unable to start the server Impossibile avviare il server - + Cannot save record to file %1 Impossibile salvare il record al file %1 @@ -409,7 +409,7 @@ QCheckBox - + Forts mode Modalità Fortino @@ -443,6 +443,11 @@ Frontend fullscreen Frontend schermo intero + + + Divide teams + + QComboBox @@ -560,7 +565,7 @@ Gioco in rete - + Playing teams Squadre in gioco @@ -593,32 +598,32 @@ Traduzioni: - + Special thanks: Ringraziamenti speciali: - + Turn time Tempo del turno - + Initial health Salute iniziale - + Weapons Armi - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Il premio per il miglior colpo è vinto da <b>%1</b> , con <b>%2</b> punti.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Un totale di <b>%1</b> Hedgehog(s) sono stati uccisi durante questo round.</p> @@ -663,7 +668,7 @@ Versione - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Il premio per il miglior colpo è stato vinto da <b>%1</b> con <b>%2</b> hedgehog uccisi.</p> @@ -692,22 +697,22 @@ QMessageBox - + Network Rete - + Connection to server is lost Connessione con il server persa - + Error Errore - + Failed to open data directory: %1 Please check your installation @@ -842,7 +847,7 @@ Carica - + Setup Impostazioni 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 @@ HWForm - + Error Błąd @@ -18,12 +18,12 @@ OK - + Unable to start the server Nie można uruchomić serwera - + Cannot save record to file %1 Nie można zapisać nagrania do pliku %1 @@ -409,7 +409,7 @@ QCheckBox - + Forts mode Tryb fortów @@ -443,6 +443,11 @@ Frontend fullscreen Pełnoekranowe menu + + + Divide teams + + QComboBox @@ -560,7 +565,7 @@ Gra sieciowa - + Playing teams Grające drużyny @@ -593,32 +598,32 @@ Tłumaczenia: - + Special thanks: Szczególne podziękowania: - + Turn time Czas trwania tury - + Initial health Punkty życia - + Weapons Uzbrojenie - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Odznaczenie za najlepszy strzał przyznano <b>%1</b>, zadał on <b>%2</b> punktów obrażeń.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Łącznie, <b>%1</b> jeży zostało zabitych w czasie tej walki.</p> @@ -663,7 +668,7 @@ <h3>Wersja 0.9.3</h3> - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Odznaczenie za najlepszy strzał otrzymuje <b>%1</b>, zabijając nim <b>%2</b> przeciwników.</p> @@ -697,22 +702,22 @@ QMessageBox - + Network Sieć - + Connection to server is lost Połączenie z serwerem zostało przerwane - + Error Błąd - + Failed to open data directory: %1 Please check your installation @@ -847,7 +852,7 @@ Wczytaj - + Setup Ustawienia 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 @@ HWForm - + Error Erro @@ -18,12 +18,12 @@ OK - + Unable to start the server Falha ao iniciar o servidor - + Cannot save record to file %1 Falha ao salvar o recorde no arquivo %1 @@ -409,7 +409,7 @@ QCheckBox - + Forts mode Modo de Fortes @@ -443,6 +443,11 @@ Frontend fullscreen Interface em tela cheia + + + Divide teams + + QComboBox @@ -560,7 +565,7 @@ Jogo em ree - + Playing teams Equipes em jogo @@ -593,32 +598,32 @@ Traduções: - + Special thanks: Agradecimentos especiais: - + Turn time Duração do turno - + Initial health Vida inicial - + Weapons Armas - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>O prêmio de melhor disparo foi ganho por <b>%1</b> , com <b>%2</b> pontos.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Um total de <b>%1</b> porco(s) espinho foram mortos durante esta rodada.</p> @@ -663,7 +668,7 @@ Versão - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>O prêmio de melhor disparo foi ganho por <b>%1</b> com <b>%2</b> mortes.</p> @@ -692,22 +697,22 @@ QMessageBox - + Network Rede - + Connection to server is lost A conexão com o servidor foi perdida - + Error Erro - + Failed to open data directory: %1 Please check your installation @@ -842,7 +847,7 @@ Carregar - + Setup Configuração 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 @@ + GameUIConfig - Error Ошибка - Cannot create directory %1 Не могу создать папку %1 - Quit Выйти - Cannot save options to file %1 Ошибка при сохранении настроек в файл %1 @@ -39,12 +36,11 @@ HWForm - + Error Ошибка - Please, select demo from the list above Выберите демо из списка @@ -54,7 +50,6 @@ ОК - Please, select server from the list above Выберите сервер из списка @@ -64,12 +59,12 @@ Выберите запись из списка - + Cannot save record to file %1 Не могу сохранить запись в файл %1 - + Unable to start the server Ошибка запуска сервера @@ -77,12 +72,10 @@ HWGame - Error Ошибка - Unable to start the server: %1. Ошибка запуска сервера: %1. @@ -92,12 +85,10 @@ ru.txt - Cannot save demo to file %1 Ошибка сохранения демо в файл %1 - Quit Выход @@ -107,7 +98,6 @@ Не могу открыть демо %1 - Unable to run engine: %1 ( Ошибка запуска движка: %1 ( @@ -133,17 +123,14 @@ HWNet - Error Ошибка - The host was not found. Please check the host name and port settings. Ошибка подключения. Проверьте имя сервера и номер порта. - Connection refused Отказано в соединении @@ -151,12 +138,10 @@ HWNetServer - Error Ошибка - Unable to start the server: %1. Ошибка запуска сервера: %1. @@ -534,7 +519,7 @@ Полный экран - + Forts mode Режим фортов @@ -558,6 +543,11 @@ Frontend fullscreen Полноэкранный фронтенд + + + Divide teams + Разделить команды + QComboBox @@ -640,7 +630,6 @@ Настройки звука и графики - Net nick Имя игрока @@ -660,7 +649,7 @@ Настройки игры - + Playing teams Команды в игре @@ -693,27 +682,22 @@ Имя игрока - Server address Адрес сервера - <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> <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> - <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; <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; - difficulty: Уровень игры: - <h3>Version 0.8</h3> <h3>Версия 0.8</h3> @@ -723,57 +707,50 @@ Эта программа распространяется на условиях лицензии GNU (the GNU General Public License) - <h2>Translations:</h2> <h2>Переводы:</h2> - <h2>Developers:</h2> <h2>Разработчики:</h2> - <h2>Translations:</h2><p> <h2>Переводы:</h2><p> - <h2>Special thanks:</h2><p> <h2>Особая благодарность:</h2><p> - <h3>Version 0.8.1</h3> <h3>Версия 0.8.1</h3> - <h2></h2><p></p> <h2></h2><p></p> - + Turn time Продолжительность хода - + Initial health Начальный уровень здоровья - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Приз за лучший выстрел получает <b>%1</b> с <b>%2</b> пунктами урона.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>За этот раунд было убито <b>%1</b> ежей.</p> - <h3>Version 0.9</h3> <h3>Версия 0.9</h3> @@ -803,7 +780,7 @@ Переводы: - + Special thanks: Особая благодарность: @@ -828,7 +805,7 @@ Порт: - + Weapons Оружие @@ -843,7 +820,7 @@ Версия - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Приз за лучший выстрел получает <b>%1</b> с <b>%2</b> поверженными врагами.</p> @@ -864,7 +841,6 @@ QMainWindow - -= by unC0Rr =- -= by unC0Rr =- @@ -877,12 +853,12 @@ QMessageBox - + Error Ошибка - + Failed to open data directory: %1 Please check your installation @@ -891,12 +867,12 @@ Проверьте правильность установки - + Network Сеть - + Connection to server is lost Соединение с сервером потеряно @@ -934,7 +910,6 @@ Не могу создать папку %1 - Quit Выйти @@ -952,27 +927,23 @@ Одиночная игра - Multiplayer Схватка - Net game Сетевая игра - Demos Демки - + Setup Настройка - Exit Выход @@ -987,12 +958,10 @@ Быстрый старт - Discard Отменить - Save Сохранить @@ -1002,12 +971,10 @@ Играть демку - New team Новая команда - Edit team Изменить @@ -1017,22 +984,18 @@ Соединить - Disconnect Разъединить - Join Присоединиться - Create Создать - Add Team Добавить команду @@ -1047,7 +1010,6 @@ Старт - About О программе @@ -1072,7 +1034,6 @@ Загрузить - Weapons scheme Схема оружия 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 @@ HWForm - + Error Chyba @@ -18,12 +18,12 @@ OK - + Unable to start the server Nie je možné spustiť server - + Cannot save record to file %1 Nie je možné zapísať záznam do súboru %1 @@ -409,7 +409,7 @@ QCheckBox - + Forts mode Režim pevností @@ -443,6 +443,11 @@ Enable music + + + Divide teams + + QComboBox @@ -560,7 +565,7 @@ Sieťová hra - + Playing teams Hrajúce teamy @@ -593,32 +598,32 @@ Preklady: - + Special thanks: Osobitné poďakovanie: - + Turn time Čas na ťah - + Initial health Úvodné zdravie - + Weapons Výzbroj - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Ocenenie za najlepší zásah vyhral(a) <b>%1</b> (<b>%2</b> bodov).</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>Celkovo bolo zabitých <b>%1</b> ježkov počas tohto kola.</p> @@ -663,7 +668,7 @@ <h3>Wersja 0.9.3</h3> - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Ocenenie za najlepší zásah získal(a) <b>%1</b>, zabil ním <b>%2</b> nepriateľov.</p> @@ -697,22 +702,22 @@ QMessageBox - + Network Sieť - + Connection to server is lost Spojenie so serverom bolo prerušené - + Error Chyba - + Failed to open data directory: %1 Please check your installation @@ -847,7 +852,7 @@ Načítať - + Setup Nastavenie 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 @@ HWForm - + Error Помилка @@ -51,12 +51,12 @@ Виберіть запис зі списку - + Cannot save record to file %1 Не можу зберегти запис до файлу %1 - + Unable to start the server Помилка при запущенні сервера @@ -521,7 +521,7 @@ Повний екран - + Forts mode Режим фортів @@ -545,6 +545,11 @@ Frontend fullscreen Фронтенд на повний екран + + + Divide teams + + QComboBox @@ -647,7 +652,7 @@ Настройки гри - + Playing teams Команди в грі @@ -740,22 +745,22 @@ <h2></h2><p></p> - + Turn time Тривалість ходу - + Initial health Початковий рівень здоров'я - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</p> <p>Нагороду за кращий постріл отримує <b>%1</b> з <b>%2</b> пунктами урону.</p> - + <p>A total of <b>%1</b> Hedgehog(s) were killed during this round.</p> <p>За цей раунд було вбито <b>%1</b> їжаків.</p> @@ -790,7 +795,7 @@ Переклади: - + Special thanks: Особлива вдячність: @@ -815,7 +820,7 @@ Порт: - + Weapons Зброя @@ -830,7 +835,7 @@ Версія - + <p>The best shot award was won by <b>%1</b> with <b>%2</b> kills.</p> <p>Нагороду за кращий постріл отримує <b>%1</b> з <b>%2</b> вбитими ворогами.</p> @@ -864,12 +869,12 @@ QMessageBox - + Error Помилка - + Failed to open data directory: %1 Please check your installation @@ -878,12 +883,12 @@ Перевірте правильність установки - + Network Мережа - + Connection to server is lost З'єднання з сервером загублено @@ -954,7 +959,7 @@ Демки - + Setup Налагодження