# HG changeset patch # User unc0rr # Date 1226145286 0 # Node ID c01512115c12d8fea4dee3ebc514a1e2424f1311 # Parent 89e24edb6020329a2c465209a42c590bb9832610 - Add es and sv translations to hedgewars.pro - perform lupdate-qt4 && lrelease-qt4 diff -r 89e24edb6020 -r c01512115c12 QTfrontend/hedgewars.pro --- a/QTfrontend/hedgewars.pro Fri Nov 07 22:03:43 2008 +0000 +++ b/QTfrontend/hedgewars.pro Sat Nov 08 11:54:46 2008 +0000 @@ -83,12 +83,14 @@ TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_bg.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_de.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_cs.ts +TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_es.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_fr.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_it.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_pl.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_pt_BR.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ru.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_sk.ts +TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_sv.ts TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_uk.ts RESOURCES += hedgewars.qrc diff -r 89e24edb6020 -r c01512115c12 netserver/Miscutils.hs --- a/netserver/Miscutils.hs Fri Nov 07 22:03:43 2008 +0000 +++ b/netserver/Miscutils.hs Sat Nov 08 11:54:46 2008 +0000 @@ -90,6 +90,9 @@ sameRoom :: HandlesSelector sameRoom client clients rooms = map handle $ filter (\ci -> room ci == room client) clients +noRoomSameProto :: HandlesSelector +noRoomSameProto client clients _ = map handle $ filter (null . room) $ filter (\ci -> protocol client == protocol ci) clients + othersInRoom :: HandlesSelector othersInRoom client clients rooms = map handle $ filter (client /=) $ filter (\ci -> room ci == room client) clients diff -r 89e24edb6020 -r c01512115c12 netserver/hedgewars-server.hs --- a/netserver/hedgewars-server.hs Fri Nov 07 22:03:43 2008 +0000 +++ b/netserver/hedgewars-server.hs Sat Nov 08 11:54:46 2008 +0000 @@ -112,6 +112,7 @@ (Accept `fmap` readTChan acceptChan) `orElse` (ClientMessage `fmap` tselect clients) `orElse` (CoreMessage `fmap` readTChan messagesChan) + case r of Accept ci -> do let sameHostClients = filter (\cl -> host ci == host cl) clients @@ -123,12 +124,14 @@ writeTChan (chan ci) ["QUIT", "Reconnected too fast"] mainLoop acceptChan messagesChan (clients ++ [ci]) rooms + ClientMessage (cmd, client) -> do (clientsIn, mrooms) <- reactCmd cmd client clients rooms let hadRooms = (not $ null rooms) && (null mrooms) in unless ((not $ isDedicated globalOptions) && ((null clientsIn) || hadRooms)) $ mainLoop acceptChan messagesChan clientsIn mrooms + CoreMessage msg -> if not $ null $ clients then do diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Sat Nov 08 11:54:46 2008 +0000 @@ -169,27 +169,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Грешка при свързване. Моля проверете името на сървъра и порта.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Отказано свързване</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation type="unfinished"></translation> </message> @@ -396,37 +396,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation type="unfinished">Създаване</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation type="unfinished">Присъединяване</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation type="unfinished">Грешка</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation type="unfinished">Добре</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation type="unfinished"></translation> </message> @@ -439,12 +439,12 @@ <translation type="obsolete">Назад</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>По подразбиране</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Изтриване</translation> </message> @@ -495,27 +495,27 @@ <translation type="obsolete">Демота</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -928,22 +928,22 @@ <translation>Загубена е връзка със сървъра</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Оръжие</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Не могат да се изтрият оръжията по подразбиране</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Да се изтрият ли тези оръжия?</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Не може да се редактират оръжията по подразбиране</translation> </message> @@ -1064,7 +1064,7 @@ <translation type="obsolete">Добавяне на отбор</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Напред!</translation> </message> @@ -1152,17 +1152,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation type="unfinished"></translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Sat Nov 08 11:54:46 2008 +0000 @@ -80,27 +80,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Počítač nebyl nalezen. Prosím zkontrolujte název počítače a nastavení portu.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Spojení odmítnuto</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation>*** %1 se připojil</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation>*** %1 odešel</translation> </message> @@ -232,37 +232,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation>Vytvořit</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation>Připojit</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation>Obnovit</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation>Prosím, zadejte název místnosti</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation>Prosím, vyberte místnost ze seznamu</translation> </message> @@ -270,12 +270,12 @@ <context> <name>PageSelectWeapon</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Původní</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Smazat</translation> </message> @@ -308,27 +308,27 @@ <translation type="obsolete">Dema</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -611,22 +611,22 @@ Prosím zkontrolujte Vaši instalaci</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Zbraně</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Nemohu upravit základní sadu nastavení zbraní</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Nemohu smazat základní sadu nastavení zbraní</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Opravdu chcete smazat tuto sadu zbraní?</translation> </message> @@ -702,7 +702,7 @@ <translation>Připraven</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Jedem!</translation> </message> @@ -735,17 +735,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation>Název místnosti</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation>Počet hráčů</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation>Hra právě běží</translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Nov 08 11:54:46 2008 +0000 @@ -80,27 +80,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Der Host wurde nicht gefunden. Bitte überprüfen Sie ihre Einstellungen.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Verbindungsaufbau abgelehnt</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation type="unfinished"></translation> </message> @@ -307,37 +307,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation type="unfinished">Fehler</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation type="unfinished"></translation> </message> @@ -350,12 +350,12 @@ <translation type="obsolete">Zurück</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Standard</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Löschen</translation> </message> @@ -393,27 +393,27 @@ <translation type="obsolete">Demos</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -761,22 +761,22 @@ konnte nicht geöffnet werden. Bitte überprüfen Sie Ihre Installation</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Waffen</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Das Standard-Waffen-Set kann nicht editiert werden</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Das Standard-Waffen-Set kann nicht gelöscht werden</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Soll dieses Waffen-Set wirklich gelöscht werden?</translation> </message> @@ -807,7 +807,7 @@ <translation type="obsolete">Warten</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Los!</translation> </message> @@ -905,17 +905,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation type="unfinished"></translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_es.qm Binary file share/hedgewars/Data/Locale/hedgewars_es.qm has changed diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_es.ts --- a/share/hedgewars/Data/Locale/hedgewars_es.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Sat Nov 08 11:54:46 2008 +0000 @@ -1,30 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS><TS version="1.1" language="es_ES"> -<defaultcodec></defaultcodec> <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="470"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="380"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="415"/> <source>Please, select record from the list above</source> <translation>Por favor, seleccione una entrada de la lista</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="381"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="416"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="471"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>No se pudo iniciar el servidor</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="647"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>No se pudo guardar entrada en el fichero %1</translation> </message> @@ -37,12 +36,12 @@ <translation>Error durante la lectura del fichero de entrenamiento</translation> </message> <message> - <location filename="../../../../QTfrontend/game.cpp" line="263"/> + <location filename="../../../../QTfrontend/game.cpp" line="273"/> <source>en.txt</source> <translation>es.txt</translation> </message> <message> - <location filename="../../../../QTfrontend/game.cpp" line="287"/> + <location filename="../../../../QTfrontend/game.cpp" line="297"/> <source>Cannot open demofile %1</source> <translation>No se pudo abrir el fichero de demo %1</translation> </message> @@ -50,12 +49,12 @@ <context> <name>HWMapContainer</name> <message> - <location filename="../../../../QTfrontend/mapContainer.cpp" line="61"/> + <location filename="../../../../QTfrontend/mapContainer.cpp" line="76"/> <source>Map</source> <translation>Mapa</translation> </message> <message> - <location filename="../../../../QTfrontend/mapContainer.cpp" line="65"/> + <location filename="../../../../QTfrontend/mapContainer.cpp" line="81"/> <source>Themes</source> <translation>Temas</translation> </message> @@ -81,20 +80,30 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="153"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="146"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>No se encontró el anfitrión. Por favor, compruebe el nombre del anfitrión y la configuración del puerto.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="150"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Conexión rechazada</translation> </message> + <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> + <source>*** %1 joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> + <source>*** %1 left</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>KB</name> @@ -116,6 +125,16 @@ <source>Save</source> <translation type="obsolete">Guardar</translation> </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="101"/> + <source>General</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="102"/> + <source>Advanced</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PageMain</name> @@ -159,6 +178,16 @@ <source>Exit</source> <translation type="obsolete">Salir</translation> </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="76"/> + <source>Local Game (Play a game on a single computer)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="80"/> + <source>Network Game (Play a game across a network)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PageMultiplayer</name> @@ -168,7 +197,7 @@ <translation type="obsolete">Volver</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="261"/> + <location filename="../../../../QTfrontend/pages.cpp" line="265"/> <source>Start</source> <translation>Empezar</translation> </message> @@ -178,33 +207,41 @@ <message> <location filename="../../../../QTfrontend/pages.cpp" line="399"/> <source>Local</source> - <translation>Local</translation> + <translation type="obsolete">Local</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="403"/> <source>Internet</source> - <translation>Internet</translation> + <translation type="obsolete">Internet</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="460"/> + <location filename="../../../../QTfrontend/pages.cpp" line="451"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="460"/> + <location filename="../../../../QTfrontend/pages.cpp" line="451"/> <source>Please, select server from the list above</source> <translation>Por favor, seleccione servidor de la lista</translation> </message> </context> <context> + <name>PageNetGame</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="550"/> + <source>Control</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageOptions</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="289"/> + <location filename="../../../../QTfrontend/pages.cpp" line="293"/> <source>New team</source> <translation>Nuevo equipo</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="294"/> + <location filename="../../../../QTfrontend/pages.cpp" line="298"/> <source>Edit team</source> <translation>Editar equipo</translation> </message> @@ -219,12 +256,12 @@ <translation type="obsolete">Volver</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="316"/> + <location filename="../../../../QTfrontend/pages.cpp" line="320"/> <source>Weapons set</source> <translation>Set de armas</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="319"/> + <location filename="../../../../QTfrontend/pages.cpp" line="323"/> <source>Edit</source> <translation>Editar</translation> </message> @@ -268,6 +305,44 @@ </message> </context> <context> + <name>PageRoomsList</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> + <source>Join</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> + <source>Error</source> + <translation type="unfinished">Error</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> + <source>Please, enter room name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> + <source>OK</source> + <translation type="unfinished">OK</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> + <source>Please, select room from the list</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageSelectWeapon</name> <message> <location filename="../../../../QTfrontend/pages.cpp" line="651"/> @@ -275,12 +350,12 @@ <translation type="obsolete">Volver</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="638"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Predeterminado</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="639"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Eliminar</translation> </message> @@ -295,103 +370,161 @@ <message> <location filename="../../../../QTfrontend/pages.cpp" line="602"/> <source>Simple Game</source> - <translation>Partida sencilla</translation> + <translation type="obsolete">Partida sencilla</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="603"/> <source>Training</source> - <translation>Entrenamiento</translation> + <translation type="obsolete">Entrenamiento</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="604"/> <source>Multiplayer</source> - <translation>Multijugador</translation> + <translation type="obsolete">Multijugador</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="605"/> <source>Saved games</source> - <translation>Partidas guardadas</translation> + <translation type="obsolete">Partidas guardadas</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="606"/> <source>Demos</source> - <translation>Demo</translation> + <translation type="obsolete">Demo</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> + <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> + <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> + <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> + <source>Demos (Watch recorded demos)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> + <source>Load (Load a previously saved game)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QAction</name> + <message> + <location filename="../../../../QTfrontend/chatwidget.cpp" line="53"/> + <source>Kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="552"/> + <source>Start</source> + <translation type="unfinished">Empezar</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="553"/> + <source>Restrict Joins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="555"/> + <source>Restrict Team Additions</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="51"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Modo Fuertes</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="348"/> + <location filename="../../../../QTfrontend/pages.cpp" line="350"/> <source>Fullscreen</source> <translation>Pantalla completa</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="356"/> + <location filename="../../../../QTfrontend/pages.cpp" line="358"/> <source>Enable sound</source> <translation>Habilitar sonido</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="364"/> + <location filename="../../../../QTfrontend/pages.cpp" line="366"/> <source>Show FPS</source> <translation>Mostrar FPS</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="368"/> + <location filename="../../../../QTfrontend/pages.cpp" line="370"/> <source>Alternative damage show</source> <translation>Mostrar daño de manera alternativa</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="360"/> + <location filename="../../../../QTfrontend/pages.cpp" line="362"/> <source>Enable music</source> <translation>Habilitar música</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="352"/> + <location filename="../../../../QTfrontend/pages.cpp" line="354"/> <source>Frontend fullscreen</source> <translation>Interfaz a pantalla completa</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> <message> - <location filename="../../../../QTfrontend/mapContainer.cpp" line="56"/> + <location filename="../../../../QTfrontend/mapContainer.cpp" line="57"/> <source>generated map...</source> <translation>Mapa generado...</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="184"/> + <location filename="../../../../QTfrontend/pages.cpp" line="155"/> <source>Human</source> <translation>Humano</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="185"/> <source>Level 5</source> - <translation>Nivel 5</translation> + <translation type="obsolete">Nivel 5</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="186"/> <source>Level 4</source> - <translation>Nivel 4</translation> + <translation type="obsolete">Nivel 4</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="187"/> <source>Level 3</source> - <translation>Nivel 3</translation> + <translation type="obsolete">Nivel 3</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="188"/> <source>Level 2</source> - <translation>Nivel 2</translation> + <translation type="obsolete">Nivel 2</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="189"/> <source>Level 1</source> - <translation>Nivel 1</translation> + <translation type="obsolete">Nivel 1</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="159"/> + <source>Level</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -399,55 +532,55 @@ <message> <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="33"/> <source>Landscape</source> - <translation>Paisaje</translation> + <translation type="obsolete">Paisaje</translation> </message> <message> <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Game scheme</source> - <translation>Esquema de juego</translation> + <translation type="obsolete">Esquema de juego</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="103"/> + <location filename="../../../../QTfrontend/pages.cpp" line="145"/> <source>Team</source> <translation>Equipo</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="113"/> + <location filename="../../../../QTfrontend/pages.cpp" line="121"/> <source>Team Members</source> <translation>Miembros del equipo</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="128"/> + <location filename="../../../../QTfrontend/pages.cpp" line="203"/> <source>Key binds</source> <translation>Asociaciones de teclas</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="169"/> <source>Grave</source> - <translation>Lápida</translation> + <translation type="obsolete">Lápida</translation> </message> <message> <location filename="../../../../QTfrontend/pages.cpp" line="181"/> <source>Team level</source> - <translation>Nivel del equipo</translation> + <translation type="obsolete">Nivel del equipo</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="199"/> + <location filename="../../../../QTfrontend/pages.cpp" line="169"/> <source>Fort</source> <translation>Fuerte</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="285"/> + <location filename="../../../../QTfrontend/pages.cpp" line="289"/> <source>Teams</source> <translation>Equipos</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="326"/> + <location filename="../../../../QTfrontend/pages.cpp" line="330"/> <source>Audio/Graphic options</source> <translation>Opciones de Audio y Gráficos</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="313"/> + <location filename="../../../../QTfrontend/pages.cpp" line="317"/> <source>Weapons</source> <translation>Armas</translation> </message> @@ -459,15 +592,15 @@ <message> <location filename="../../../../QTfrontend/pages.cpp" line="394"/> <source>Servers list</source> - <translation>Lista de servidores</translation> + <translation type="obsolete">Lista de servidores</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="407"/> + <location filename="../../../../QTfrontend/pages.cpp" line="399"/> <source>Net game</source> <translation>Juego en red</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="217"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Equipos participantes</translation> </message> @@ -500,32 +633,32 @@ <translation>Traducciones:</translation> </message> <message> - <location filename="../../../../QTfrontend/about.cpp" line="89"/> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Agradecimientos:</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="54"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Duración del turno</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="55"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Vida inicial</translation> </message> <message> - <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="58"/> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Armas</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="589"/> + <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>El premio al mejor disparo es para <b>%1</b> , con <b>%2</b> puntos.</p></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="601"/> + <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> Erizo(s) resultaron muertos durante este asalto.</p></translation> </message> @@ -540,27 +673,27 @@ <translation>Puerto:</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="332"/> + <location filename="../../../../QTfrontend/pages.cpp" line="336"/> <source>Resolution</source> <translation>Resolución</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="343"/> + <location filename="../../../../QTfrontend/pages.cpp" line="345"/> <source>FPS limit</source> <translation>Límite de FPS</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="297"/> + <location filename="../../../../QTfrontend/pages.cpp" line="301"/> <source>Net nick</source> <translation>Apodo en red</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="504"/> + <location filename="../../../../QTfrontend/pages.cpp" line="495"/> <source>Server name:</source> <translation>Nombre del servidor:</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="511"/> + <location filename="../../../../QTfrontend/pages.cpp" line="502"/> <source>Server port:</source> <translation>Puerto del servidor:</translation> </message> @@ -570,7 +703,7 @@ <translation>Versión</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="596"/> + <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>El premio al mejor disparo es para <b>%1</b> con <b>%2</b> erizos muertos.</p></translation> </message> @@ -583,7 +716,7 @@ <context> <name>QLineEdit</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="302"/> + <location filename="../../../../QTfrontend/pages.cpp" line="306"/> <source>unnamed</source> <translation>sin nombre</translation> </message> @@ -599,22 +732,22 @@ <context> <name>QMessageBox</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="511"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="512"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Se perdió la conexión con el servidor</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="243"/> + <location filename="../../../../QTfrontend/main.cpp" line="315"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="246"/> + <location filename="../../../../QTfrontend/main.cpp" line="318"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -623,22 +756,22 @@ Verifique su instalación</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="168"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Armas</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>No se puede editar el set de armas predefinido</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>No se puede eliminar el set de armas predefinido</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="168"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>¿Realmente desea eliminar este set de armas?</translation> </message> @@ -646,17 +779,17 @@ <context> <name>QObject</name> <message> - <location filename="../../../../QTfrontend/main.cpp" line="38"/> + <location filename="../../../../QTfrontend/main.cpp" line="35"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="39"/> + <location filename="../../../../QTfrontend/main.cpp" line="36"/> <source>Cannot create directory %1</source> <translation>No se pudo crear el directorio %1</translation> </message> <message> - <location filename="../../../../QTfrontend/main.cpp" line="40"/> + <location filename="../../../../QTfrontend/main.cpp" line="37"/> <source>OK</source> <translation>OK</translation> </message> @@ -666,15 +799,15 @@ <message> <location filename="../../../../QTfrontend/hwform.cpp" line="524"/> <source>Waiting</source> - <translation>Esperando</translation> + <translation type="obsolete">Esperando</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Adelante!</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="520"/> + <location filename="../../../../QTfrontend/pages.cpp" line="511"/> <source>default</source> <translation>predeterminado</translation> </message> @@ -689,22 +822,22 @@ <translation>Cancelar</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="389"/> + <location filename="../../../../QTfrontend/pages.cpp" line="392"/> <source>Start server</source> <translation>Iniciar servidor</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="416"/> + <location filename="../../../../QTfrontend/pages.cpp" line="408"/> <source>Connect</source> <translation>Conectar</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="425"/> + <location filename="../../../../QTfrontend/pages.cpp" line="417"/> <source>Update</source> <translation>Actualizar</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="430"/> + <location filename="../../../../QTfrontend/pages.cpp" line="422"/> <source>Specify</source> <translation>Especificar</translation> </message> @@ -714,7 +847,7 @@ <translation type="obsolete">Volver</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="484"/> + <location filename="../../../../QTfrontend/pages.cpp" line="475"/> <source>Start</source> <translation>Empezar</translation> </message> @@ -749,30 +882,58 @@ <translation>Cargar</translation> </message> <message> - <location filename="../../../../QTfrontend/teamselect.cpp" line="226"/> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Configuración</translation> </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="427"/> + <source>Join official server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="545"/> + <source>Ready</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTableWidget</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> + <source>Room name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> + <source>Players number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> + <source>Round in progress</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QToolBox</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="134"/> + <location filename="../../../../QTfrontend/pages.cpp" line="209"/> <source>Actions</source> <translation>Acciones</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="136"/> + <location filename="../../../../QTfrontend/pages.cpp" line="211"/> <source>Weapons</source> <translation>Armas</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="138"/> + <location filename="../../../../QTfrontend/pages.cpp" line="213"/> <source>Weapon properties</source> <translation>Propiedades del arma</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="140"/> + <location filename="../../../../QTfrontend/pages.cpp" line="215"/> <source>Other</source> <translation>Otros</translation> </message> @@ -973,137 +1134,137 @@ <context> <name>teams</name> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="45"/> + <location filename="../../../../QTfrontend/predefteams.h" line="53"/> <source>Hedgehogs</source> <translation>Erizos</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="46"/> + <location filename="../../../../QTfrontend/predefteams.h" line="54"/> <source>hedgehog 1</source> <translation>erizo 1</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="47"/> + <location filename="../../../../QTfrontend/predefteams.h" line="55"/> <source>hedgehog 2</source> <translation>erizo 2</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="48"/> + <location filename="../../../../QTfrontend/predefteams.h" line="56"/> <source>hedgehog 3</source> <translation>erizo 3</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="49"/> + <location filename="../../../../QTfrontend/predefteams.h" line="57"/> <source>hedgehog 4</source> <translation>erizo 4</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="50"/> + <location filename="../../../../QTfrontend/predefteams.h" line="58"/> <source>hedgehog 5</source> <translation>erizo 5</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="51"/> + <location filename="../../../../QTfrontend/predefteams.h" line="59"/> <source>hedgehog 6</source> <translation>erizo 6</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="52"/> + <location filename="../../../../QTfrontend/predefteams.h" line="60"/> <source>hedgehog 7</source> <translation>erizo 7</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="53"/> + <location filename="../../../../QTfrontend/predefteams.h" line="61"/> <source>hedgehog 8</source> <translation>erizo 8</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="57"/> + <location filename="../../../../QTfrontend/predefteams.h" line="73"/> <source>Goddess</source> <translation>Diosas</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="58"/> + <location filename="../../../../QTfrontend/predefteams.h" line="74"/> <source>Isis</source> <translation>Isis</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="59"/> + <location filename="../../../../QTfrontend/predefteams.h" line="75"/> <source>Astarte</source> <translation>Astarté</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="60"/> + <location filename="../../../../QTfrontend/predefteams.h" line="76"/> <source>Diana</source> <translation>Diana</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="61"/> + <location filename="../../../../QTfrontend/predefteams.h" line="77"/> <source>Aphrodite</source> <translation>Afrodita</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="62"/> + <location filename="../../../../QTfrontend/predefteams.h" line="78"/> <source>Hecate</source> <translation>Hécate</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="63"/> + <location filename="../../../../QTfrontend/predefteams.h" line="79"/> <source>Demeter</source> <translation>Deméter</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="64"/> + <location filename="../../../../QTfrontend/predefteams.h" line="80"/> <source>Kali</source> <translation>Kali</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="65"/> + <location filename="../../../../QTfrontend/predefteams.h" line="81"/> <source>Inanna</source> <translation>Inanna</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="69"/> + <location filename="../../../../QTfrontend/predefteams.h" line="93"/> <source>Fruits</source> <translation>Frutas</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="70"/> + <location filename="../../../../QTfrontend/predefteams.h" line="94"/> <source>Banana</source> <translation>Plátano</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="71"/> + <location filename="../../../../QTfrontend/predefteams.h" line="95"/> <source>Apple</source> <translation>Manzana</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="72"/> + <location filename="../../../../QTfrontend/predefteams.h" line="96"/> <source>Orange</source> <translation>Naranja</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="73"/> + <location filename="../../../../QTfrontend/predefteams.h" line="97"/> <source>Lemon</source> <translation>Limón</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="74"/> + <location filename="../../../../QTfrontend/predefteams.h" line="98"/> <source>Pineapple</source> <translation>Piña</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="75"/> + <location filename="../../../../QTfrontend/predefteams.h" line="99"/> <source>Mango</source> <translation>Mango</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="76"/> + <location filename="../../../../QTfrontend/predefteams.h" line="100"/> <source>Peach</source> <translation>Melocotón</translation> </message> <message> - <location filename="../../../../QTfrontend/predefteams.h" line="77"/> + <location filename="../../../../QTfrontend/predefteams.h" line="101"/> <source>Plum</source> <translation>Ciruela</translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Sat Nov 08 11:54:46 2008 +0000 @@ -169,27 +169,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Erreur</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Le serveur n'a pas été trouvé. Vérifiez le nom du serveur et le port.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Connexion refusée</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation type="unfinished"></translation> </message> @@ -396,37 +396,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation type="unfinished">Создать</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation type="unfinished">Присоединиться</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation type="unfinished"></translation> </message> @@ -439,12 +439,12 @@ <translation type="obsolete">Retour</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Défaut</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Supprimer</translation> </message> @@ -480,27 +480,27 @@ <translation type="obsolete">Parties sauvées</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -913,22 +913,22 @@ <translation>La connexion au serveur à été perdue</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Armes</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Impossible de supprimer le set d'armes par défaut</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Supprimer ce set d'armes ?</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Impossible d'éditer le set d'armes par défaut</translation> </message> @@ -1049,7 +1049,7 @@ <translation type="obsolete">Добавить команду</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Go!</translation> </message> @@ -1137,17 +1137,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation type="unfinished"></translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Sat Nov 08 11:54:46 2008 +0000 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS><TS version="1.1" language="it_IT"> -<defaultcodec></defaultcodec> <context> <name>HWForm</name> <message> @@ -81,27 +80,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Host non trovato. Controllare impostazioni di nome host e porta.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Connessione rifiutata</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation>*** %1 è entrato</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation>*** %1 è uscito</translation> </message> @@ -308,37 +307,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation>Crea</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation>Entra</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation>Aggiorna</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation>Inserisci il nome della room</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation>Seleziona la room dalla lista</translation> </message> @@ -351,12 +350,12 @@ <translation type="obsolete">Indietro</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Default</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Elimina</translation> </message> @@ -394,27 +393,27 @@ <translation type="obsolete">Demo</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation>Partita singola ( Una partita veloce contro il computer, con le impostazioni scelte da te)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation>Multigiocatore (Gioca contro i tuoi amici, o squadre di AI)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation>Modalità Allenamento (Allena le tue abilità in una gamma di missioni). IN SVILUPPO</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation>Demo (Guarda le partite registrate)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation>Carica (Carica una partita precedentemente salvata)</translation> </message> @@ -609,6 +608,7 @@ <context> <name>QLabel</name> <message> + <location filename="" line="0"/> <source><h3>Version 0.9.2</h3></source> <translation type="obsolete"><h3>Versione 0.9.2</h3></translation> </message> @@ -756,22 +756,22 @@ Controllare la propria installazione</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Armi</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Non è possibile modificare il set di armi predefinito</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Non è possibile eliminare il set di armi predefinito</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Vuoi davvero eliminare questo set di armi?</translation> </message> @@ -802,7 +802,7 @@ <translation type="obsolete">In attesa</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Gioca!</translation> </message> @@ -900,17 +900,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation>Nome della room</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation>Numero di giocatori</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation>Round in corso</translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Sat Nov 08 11:54:46 2008 +0000 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS><TS version="1.1" language="pl"> -<defaultcodec></defaultcodec> <context> <name>HWForm</name> <message> @@ -81,27 +80,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Stacja nie została znaleziona. Sprawdź nazwę stacji i ustawienia portu.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Połączenie odrzucone</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation>*** %1 dołączył</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation>*** %1 wyszedł</translation> </message> @@ -117,10 +116,12 @@ <context> <name>PageEditTeam</name> <message> + <location filename="" line="0"/> <source>Discard</source> <translation type="obsolete">Zaniechaj</translation> </message> <message> + <location filename="" line="0"/> <source>Save</source> <translation type="obsolete">Zapisz</translation> </message> @@ -138,34 +139,42 @@ <context> <name>PageMain</name> <message> + <location filename="" line="0"/> <source>Single Player</source> <translation type="obsolete">Gra jednoosobowa</translation> </message> <message> + <location filename="" line="0"/> <source>Multiplayer</source> <translation type="obsolete">Gra wieloosobowa</translation> </message> <message> + <location filename="" line="0"/> <source>Net game</source> <translation type="obsolete">Gra sieciowa</translation> </message> <message> + <location filename="" line="0"/> <source>Saved games</source> <translation type="obsolete">Zapisane gry</translation> </message> <message> + <location filename="" line="0"/> <source>Demos</source> <translation type="obsolete">Dema</translation> </message> <message> + <location filename="" line="0"/> <source>Setup</source> <translation type="obsolete">Ustawienia</translation> </message> <message> + <location filename="" line="0"/> <source>About</source> <translation type="obsolete">O programie</translation> </message> <message> + <location filename="" line="0"/> <source>Exit</source> <translation type="obsolete">Wyjście</translation> </message> @@ -183,6 +192,7 @@ <context> <name>PageMultiplayer</name> <message> + <location filename="" line="0"/> <source>Back</source> <translation type="obsolete">Powrót</translation> </message> @@ -195,10 +205,12 @@ <context> <name>PageNet</name> <message> + <location filename="" line="0"/> <source>Local</source> <translation type="obsolete">Sieć lokalna</translation> </message> <message> + <location filename="" line="0"/> <source>Internet</source> <translation type="obsolete">Internet</translation> </message> @@ -234,10 +246,12 @@ <translation>Edycja drużyny</translation> </message> <message> + <location filename="" line="0"/> <source>Save</source> <translation type="obsolete">Zapisz</translation> </message> <message> + <location filename="" line="0"/> <source>Back</source> <translation type="obsolete">Powrót</translation> </message> @@ -293,37 +307,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation>Stwórz</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation>Dołącz</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation>Odśwież</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation>Wprowadź nazwę pokoju</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation>Wybierz pokój z listy</translation> </message> @@ -331,20 +345,22 @@ <context> <name>PageSelectWeapon</name> <message> + <location filename="" line="0"/> <source>Back</source> <translation type="obsolete">Powrót</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Domyślne</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Usuń</translation> </message> <message> + <location filename="" line="0"/> <source>Save</source> <translation type="obsolete">Zapisz</translation> </message> @@ -377,27 +393,27 @@ <translation type="obsolete">Dema</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation>Prosta Gra (Szybka gra przeciwko komputerowi, ustawienia są już wybrane za ciebie)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished">Gra Wieloosobowa (Graj z kumplami lub z komputerem zmieniając miejsca)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished">Trening (Ćwicz swoje umiejętności na kilku misjach treningowych). W PRODUKCJI</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation>Dema (Zobacz nagrane dema)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation>Wczytaj grę (Wczytaj poprzednio zapisaną grę)</translation> </message> @@ -481,22 +497,27 @@ <translation>Człowiek</translation> </message> <message> + <location filename="" line="0"/> <source>Level 5</source> <translation type="obsolete">Poziom 5</translation> </message> <message> + <location filename="" line="0"/> <source>Level 4</source> <translation type="obsolete">Poziom 4</translation> </message> <message> + <location filename="" line="0"/> <source>Level 3</source> <translation type="obsolete">Poziom 3</translation> </message> <message> + <location filename="" line="0"/> <source>Level 2</source> <translation type="obsolete">Poziom 2</translation> </message> <message> + <location filename="" line="0"/> <source>Level 1</source> <translation type="obsolete">Poziom 1</translation> </message> @@ -509,10 +530,12 @@ <context> <name>QGroupBox</name> <message> + <location filename="" line="0"/> <source>Landscape</source> <translation type="obsolete">Pejzaż</translation> </message> <message> + <location filename="" line="0"/> <source>Game scheme</source> <translation type="obsolete">Ustawienia gry</translation> </message> @@ -532,10 +555,12 @@ <translation>Ustawienia klawiszy</translation> </message> <message> + <location filename="" line="0"/> <source>Grave</source> <translation type="obsolete">Nagrobek</translation> </message> <message> + <location filename="" line="0"/> <source>Team level</source> <translation type="obsolete">Poziom drużyny</translation> </message> @@ -560,10 +585,12 @@ <translation>Bronie</translation> </message> <message> + <location filename="" line="0"/> <source>Net options</source> <translation type="obsolete">Ustawienia sieciowe</translation> </message> <message> + <location filename="" line="0"/> <source>Servers list</source> <translation type="obsolete">Lista serwerów</translation> </message> @@ -581,6 +608,7 @@ <context> <name>QLabel</name> <message> + <location filename="" line="0"/> <source><h3>Version 0.9.2</h3></source> <translation type="obsolete"><h3>Wersja 0.9.2</h3></translation> </message> @@ -670,6 +698,7 @@ <translation>Port serwera:</translation> </message> <message> + <location filename="" line="0"/> <source><h3>Version 0.9.3</h3></source> <translation type="obsolete"><h3>Wersja 0.9.3</h3></translation> </message> @@ -732,22 +761,22 @@ Sprawdź poprawność instalacji</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Bronie</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Nie można zmienić domyślnych ustawień uzbrojenia</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Nie można usunąć domyślnych ustawień uzbrojenia</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Czy naprawdę usunąć wybrane ustawienia uzbrojenia?</translation> </message> @@ -778,7 +807,7 @@ <translation type="obsolete">Oczekiwanie</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Dalej!</translation> </message> @@ -818,6 +847,7 @@ <translation>Ustawienia własne</translation> </message> <message> + <location filename="" line="0"/> <source>Back</source> <translation type="obsolete">Powrót</translation> </message> @@ -827,10 +857,12 @@ <translation>Rozpoczęcie</translation> </message> <message> + <location filename="" line="0"/> <source>Simple Game</source> <translation type="obsolete">Szybka gra</translation> </message> <message> + <location filename="" line="0"/> <source>Training</source> <translation type="obsolete">Trening</translation> </message> @@ -873,17 +905,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation>Nazwa pokoju</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation>Liczba graczy</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation>Gra w toku</translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Sat Nov 08 11:54:46 2008 +0000 @@ -80,27 +80,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation type="unfinished">O servidor nao foi encontrado. Por favor, verifique o nome do servidor e as configurações de porta.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Conexão negada</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation type="unfinished"></translation> </message> @@ -307,37 +307,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation type="unfinished">Erro</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation type="unfinished"></translation> </message> @@ -350,12 +350,12 @@ <translation type="obsolete">Volver</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Padrão</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Excluir</translation> </message> @@ -393,27 +393,27 @@ <translation type="obsolete">Demonstrações</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -756,22 +756,22 @@ Por favor verifique sua instalação</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Armas</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Não foi possível editar o set de armas padrão</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Não foi possível excluir o set padrão de armas</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation type="unfinished">Realmente deseja remover este set de armas?</translation> </message> @@ -802,7 +802,7 @@ <translation type="obsolete">Aguardando</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation type="unfinished">Avançar!</translation> </message> @@ -900,17 +900,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation type="unfinished"></translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Sat Nov 08 11:54:46 2008 +0000 @@ -182,27 +182,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Ошибка подключения. Проверьте имя сервера и номер порта.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Отказано в соединении</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation>*** %1 вошёл</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation>*** %1 вышел</translation> </message> @@ -409,37 +409,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation>Создать</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation>Присоединиться</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation>Введите название комнаты</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation>ОК</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation>Выберите комнату из списка</translation> </message> @@ -452,12 +452,12 @@ <translation type="obsolete">Назад</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Удалить</translation> </message> @@ -508,27 +508,27 @@ <translation type="obsolete">Демки</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation>Быстрый старт (быстрый запуск игры против компьютера на случайной карте)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation>Схватка (игра с друзьями за одним компьютером или против ботов)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation>Тренировка (тренируйте своё мастерство в тренировочных миссиях) В РАЗРАБОТКЕ</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation>Демки (просмотр записанных демок)</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation>Загрузить (загрузить сохранённую игру)</translation> </message> @@ -941,22 +941,22 @@ <translation>Соединение с сервером потеряно</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Оружие</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Невозможно удалить набор оружия по умолчанию</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Удалить выбранный набор оружия?</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Невозможно редактировать набор оружия по умолчанию</translation> </message> @@ -1077,7 +1077,7 @@ <translation type="obsolete">Добавить команду</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Вперёд!</translation> </message> @@ -1165,17 +1165,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation>Название комнаты</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation>Кол-во игроков</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation>Идёт раунд</translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Sat Nov 08 11:54:46 2008 +0000 @@ -80,27 +80,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Stanica nebola nájdená. Prosím, skontrolujte názov stanice a nastavenia portu.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Spojenie odmietnuté</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation type="unfinished"></translation> </message> @@ -307,37 +307,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation type="unfinished">Chyba</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation type="unfinished">OK</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation type="unfinished"></translation> </message> @@ -350,12 +350,12 @@ <translation type="obsolete">Späť</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Východzie</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Vymazať</translation> </message> @@ -393,27 +393,27 @@ <translation type="obsolete">Demá</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -761,22 +761,22 @@ Skontrolujte si vašu inštaláciu</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Zbrane</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Nie je možné upraviť východziu sadu zbraní</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Nie je možné vymazať východziu sadu zbraní</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Určite chcete vymazať túto sadu zbraní?</translation> </message> @@ -807,7 +807,7 @@ <translation type="obsolete">Čakám</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Choď!</translation> </message> @@ -905,17 +905,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation type="unfinished"></translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_sv.qm Binary file share/hedgewars/Data/Locale/hedgewars_sv.qm has changed diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_sv.ts --- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Sat Nov 08 11:54:46 2008 +0000 @@ -1,23 +1,29 @@ -<!DOCTYPE TS><TS> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS><TS version="1.1"> <context> <name>HWForm</name> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="538"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="415"/> <source>Please, select record from the list above</source> <translation>Var god välj inspelning från listan nedanför</translation> </message> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="416"/> <source>OK</source> <translation>OK</translation> </message> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="539"/> <source>Unable to start the server</source> <translation>Kan inte starta serven</translation> </message> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="717"/> <source>Cannot save record to file %1</source> <translation>Kan inte spara inspelning till fil %1</translation> </message> @@ -25,29 +31,48 @@ <context> <name>HWGame</name> <message> + <location filename="../../../../QTfrontend/game.cpp" line="140"/> <source>Error reading training config file</source> <translation>Fel uppstod vid inläsning av </translation> </message> <message> + <location filename="../../../../QTfrontend/game.cpp" line="273"/> <source>en.txt</source> <translation>sv.txt</translation> </message> <message> + <location filename="../../../../QTfrontend/game.cpp" line="297"/> <source>Cannot open demofile %1</source> <translation>Kan inte öppna demofil %1</translation> </message> </context> <context> + <name>HWMapContainer</name> + <message> + <location filename="../../../../QTfrontend/mapContainer.cpp" line="76"/> + <source>Map</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/mapContainer.cpp" line="81"/> + <source>Themes</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HWNetServersModel</name> <message> + <location filename="../../../../QTfrontend/netserverslist.cpp" line="45"/> <source>Title</source> <translation>Titel</translation> </message> <message> + <location filename="../../../../QTfrontend/netserverslist.cpp" line="46"/> <source>IP</source> <translation>IP</translation> </message> <message> + <location filename="../../../../QTfrontend/netserverslist.cpp" line="47"/> <source>Port</source> <translation>Port</translation> </message> @@ -55,21 +80,35 @@ <context> <name>HWNewNet</name> <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Värden hittades inte. Var god kontrollera värdnamnet och portinställningarna.</translation> </message> <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Kontakt vägrades</translation> </message> + <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> + <source>*** %1 joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> + <source>*** %1 left</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>KB</name> <message> + <location filename="../../../../QTfrontend/KB.h" line="32"/> <source>SDL_ttf returned error while rendering text, most propably it is related to the bug in freetype2. It's recommended to update your freetype lib.</source> <translation>Fel uppstod då SDL_ttf skulle rendera text. Det beror högst troligen på buggen i freetype2. Du rekommenderas att uppdatera ditt freetype lib.</translation> </message> @@ -77,56 +116,88 @@ <context> <name>PageEditTeam</name> <message> + <location filename="" line="0"/> <source>Discard</source> - <translation>Förkasta</translation> + <translation type="obsolete">Förkasta</translation> </message> <message> + <location filename="" line="0"/> <source>Save</source> - <translation>Spara</translation> + <translation type="obsolete">Spara</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="101"/> + <source>General</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="102"/> + <source>Advanced</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>PageMain</name> <message> + <location filename="" line="0"/> <source>Single Player</source> - <translation>Enspelarläge</translation> + <translation type="obsolete">Enspelarläge</translation> </message> <message> + <location filename="" line="0"/> <source>Multiplayer</source> - <translation>Flerspelarläge</translation> + <translation type="obsolete">Flerspelarläge</translation> </message> <message> + <location filename="" line="0"/> <source>Net game</source> - <translation>Internetspel</translation> + <translation type="obsolete">Internetspel</translation> + </message> + <message> + <location filename="" line="0"/> + <source>Saved games</source> + <translation type="obsolete">Sparade spel</translation> </message> <message> - <source>Saved games</source> - <translation>Sparade spel</translation> + <location filename="" line="0"/> + <source>Demos</source> + <translation type="obsolete">Demos</translation> </message> <message> - <source>Demos</source> - <translation>Demos</translation> + <location filename="" line="0"/> + <source>Setup</source> + <translation type="obsolete">Inställningar</translation> </message> <message> - <source>Setup</source> - <translation>Inställningar</translation> + <location filename="" line="0"/> + <source>About</source> + <translation type="obsolete">Upphovsmän</translation> </message> <message> - <source>About</source> - <translation>Upphovsmän</translation> + <location filename="" line="0"/> + <source>Exit</source> + <translation type="obsolete">Avsluta</translation> </message> <message> - <source>Exit</source> - <translation>Avsluta</translation> + <location filename="../../../../QTfrontend/pages.cpp" line="76"/> + <source>Local Game (Play a game on a single computer)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="80"/> + <source>Network Game (Play a game across a network)</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>PageMultiplayer</name> <message> + <location filename="" line="0"/> <source>Back</source> - <translation>Tillbaka</translation> + <translation type="obsolete">Tillbaka</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="265"/> <source>Start</source> <translation>Starta</translation> </message> @@ -134,45 +205,63 @@ <context> <name>PageNet</name> <message> + <location filename="" line="0"/> <source>Local</source> - <translation>Lokal</translation> + <translation type="obsolete">Lokal</translation> </message> <message> + <location filename="" line="0"/> <source>Internet</source> - <translation>Internet</translation> + <translation type="obsolete">Internet</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="451"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="451"/> <source>Please, select server from the list above</source> <translation>Var god välj server från listan nedanför</translation> </message> </context> <context> + <name>PageNetGame</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="550"/> + <source>Control</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageOptions</name> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="293"/> <source>New team</source> <translation>Nytt lag</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="298"/> <source>Edit team</source> <translation>Redigera lag</translation> </message> <message> + <location filename="" line="0"/> <source>Save</source> - <translation>Spara</translation> + <translation type="obsolete">Spara</translation> </message> <message> + <location filename="" line="0"/> <source>Back</source> - <translation>Tillbaka</translation> + <translation type="obsolete">Tillbaka</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="320"/> <source>Weapons set</source> <translation>Vapenuppsättning</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="323"/> <source>Edit</source> <translation>Redigera</translation> </message> @@ -180,170 +269,313 @@ <context> <name>PagePlayDemo</name> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="149"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="137"/> <source>Please, select record from the list</source> <translation>Var god välj inspelning från listan</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="138"/> <source>OK</source> <translation>OK</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="113"/> <source>Rename dialog</source> <translation>Döp om dialog</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="113"/> <source>Enter new file name:</source> <translation>Skriv in nytt filnamn:</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="124"/> <source>Cannot rename to</source> <translation>Kan inte döpa om till</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="149"/> <source>Cannot delete file</source> <translation>Kan inte radera fil</translation> </message> </context> <context> + <name>PageRoomsList</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> + <source>Create</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> + <source>Join</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> + <source>Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> + <source>Error</source> + <translation type="unfinished">Fel</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> + <source>Please, enter room name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> + <source>OK</source> + <translation type="unfinished">OK</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> + <source>Please, select room from the list</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageSelectWeapon</name> <message> + <location filename="" line="0"/> <source>Back</source> - <translation>Tillbaka</translation> + <translation type="obsolete">Tillbaka</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>Standard</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Radera</translation> </message> <message> + <location filename="" line="0"/> <source>Save</source> - <translation>Spara</translation> + <translation type="obsolete">Spara</translation> + </message> +</context> +<context> + <name>PageSinglePlayer</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> + <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> + <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> + <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> + <source>Demos (Watch recorded demos)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> + <source>Load (Load a previously saved game)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QAction</name> + <message> + <location filename="../../../../QTfrontend/chatwidget.cpp" line="53"/> + <source>Kick</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="552"/> + <source>Start</source> + <translation type="unfinished">Starta</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="553"/> + <source>Restrict Joins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="555"/> + <source>Restrict Team Additions</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>QCheckBox</name> <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="45"/> <source>Forts mode</source> <translation>Visa fort</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="350"/> <source>Fullscreen</source> <translation>Helskärm</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="358"/> <source>Enable sound</source> <translation>Aktivera ljud</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="366"/> <source>Show FPS</source> <translation>Visa FPS</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="370"/> <source>Alternative damage show</source> <translation>Visa alternativ skada</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="362"/> <source>Enable music</source> <translation>Aktivera musik</translation> </message> + <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="49"/> + <source>Divide teams</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="354"/> + <source>Frontend fullscreen</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QComboBox</name> <message> + <location filename="../../../../QTfrontend/mapContainer.cpp" line="57"/> <source>generated map...</source> <translation>genererad karta...</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="155"/> <source>Human</source> <translation>Människa</translation> </message> <message> + <location filename="" line="0"/> <source>Level 5</source> - <translation>Nivå 5</translation> + <translation type="obsolete">Nivå 5</translation> </message> <message> + <location filename="" line="0"/> <source>Level 4</source> - <translation>Nivå 4</translation> + <translation type="obsolete">Nivå 4</translation> </message> <message> + <location filename="" line="0"/> <source>Level 3</source> - <translation>Nivå 3</translation> + <translation type="obsolete">Nivå 3</translation> </message> <message> + <location filename="" line="0"/> <source>Level 2</source> - <translation>Nivå 2</translation> + <translation type="obsolete">Nivå 2</translation> </message> <message> + <location filename="" line="0"/> <source>Level 1</source> - <translation>Nivå 1</translation> + <translation type="obsolete">Nivå 1</translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="159"/> + <source>Level</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>QGroupBox</name> <message> + <location filename="" line="0"/> <source>Landscape</source> - <translation>Landskap</translation> + <translation type="obsolete">Landskap</translation> </message> <message> + <location filename="" line="0"/> <source>Game scheme</source> - <translation>Spelupplägg</translation> + <translation type="obsolete">Spelupplägg</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="145"/> <source>Team</source> <translation>Lag</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="121"/> <source>Team Members</source> <translation>Lagmedlemmar</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="203"/> <source>Key binds</source> <translation>Tangentkontroller</translation> </message> <message> + <location filename="" line="0"/> <source>Grave</source> - <translation>Grav</translation> + <translation type="obsolete">Grav</translation> </message> <message> + <location filename="" line="0"/> <source>Team level</source> - <translation>Lagnivå</translation> + <translation type="obsolete">Lagnivå</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="169"/> <source>Fort</source> <translation>Fort</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="289"/> <source>Teams</source> <translation>Lag</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="330"/> <source>Audio/Graphic options</source> <translation>Ljud/grafikinställningar</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="317"/> <source>Weapons</source> <translation>Vapen</translation> </message> <message> + <location filename="" line="0"/> <source>Net options</source> - <translation>Internetinställningar</translation> + <translation type="obsolete">Internetinställningar</translation> </message> <message> + <location filename="" line="0"/> <source>Servers list</source> - <translation>Serverlista</translation> + <translation type="obsolete">Serverlista</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="399"/> <source>Net game</source> <translation>Internetspel</translation> </message> <message> + <location filename="../../../../QTfrontend/teamselect.cpp" line="227"/> <source>Playing teams</source> <translation>Spelande lag</translation> </message> @@ -351,86 +583,107 @@ <context> <name>QLabel</name> <message> + <location filename="" line="0"/> <source><h3>Version 0.9.2</h3></source> <translation type="obsolete"><h3>Versione 0.9.2</h3></translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="42"/> <source>This program is distributed under the GNU General Public License</source> <translation>Detta program distribueras under GNU General Public License</translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="52"/> <source>Developers:</source> <translation>Utvecklare:</translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="57"/> <source>Art:</source> <translation>Grafik:</translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="76"/> <source>Translations:</source> <translation>Översättningar:</translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="93"/> <source>Special thanks:</source> <translation>Särskilt tack till:</translation> </message> <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="52"/> <source>Turn time</source> <translation>Tid per drag</translation> </message> <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="53"/> <source>Initial health</source> <translation>Hälsa vid start</translation> </message> <message> + <location filename="../../../../QTfrontend/gamecfgwidget.cpp" line="56"/> <source>Weapons</source> <translation>Vapen</translation> </message> <message> + <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>Priset för bästa skott går till <b>%1</b> , med <b>%2</b> poäng.</p></translation> </message> <message> + <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>En summa av <b>%1</b> igelkott(ar) dödades under denna runda.</p></translation> </message> <message> + <location filename="../../../../QTfrontend/input_ip.cpp" line="32"/> <source>Host:</source> <translation>Värd:</translation> </message> <message> + <location filename="../../../../QTfrontend/input_ip.cpp" line="36"/> <source>Port:</source> <translation>Port:</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="336"/> <source>Resolution</source> <translation>Upplösning</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="345"/> <source>FPS limit</source> <translation>FPS-begränsning</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="301"/> <source>Net nick</source> <translation>Internetnamn</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="495"/> <source>Server name:</source> <translation>Servernamn:</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="502"/> <source>Server port:</source> <translation>Serverport:</translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="39"/> <source>Version</source> <translation>Version</translation> </message> <message> + <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>Priset för bästa skott går till <b>%1</b> med <b>%2</b> dödade igelkottar.</p></translation> </message> <message> + <location filename="../../../../QTfrontend/about.cpp" line="68"/> <source>Sounds:</source> <translation>Ljudeffekter:</translation> </message> @@ -438,6 +691,7 @@ <context> <name>QLineEdit</name> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="306"/> <source>unnamed</source> <translation>onämnd</translation> </message> @@ -445,6 +699,7 @@ <context> <name>QMainWindow</name> <message> + <location filename="../../../../QTfrontend/ui_hwform.cpp" line="35"/> <source>Hedgewars</source> <translation>Hedgewars</translation> </message> @@ -452,18 +707,22 @@ <context> <name>QMessageBox</name> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="583"/> <source>Network</source> <translation>Nätverk</translation> </message> <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="584"/> <source>Connection to server is lost</source> <translation>Kontakten med servern förlorades</translation> </message> <message> + <location filename="../../../../QTfrontend/main.cpp" line="315"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/main.cpp" line="318"/> <source>Failed to open data directory: %1 Please check your installation</source> @@ -472,18 +731,22 @@ Var god kontrollera din installation</translation> </message> <message> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Vapen</translation> </message> <message> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Kan inte redigera vapnens standarduppsättning</translation> </message> <message> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Kan inte radera vapnens standarduppsättning</translation> </message> <message> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Vill du verkligen radera denna vapenuppsättning?</translation> </message> @@ -491,14 +754,17 @@ <context> <name>QObject</name> <message> + <location filename="../../../../QTfrontend/main.cpp" line="35"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/main.cpp" line="36"/> <source>Cannot create directory %1</source> <translation>Kan inte skapa katalog %1</translation> </message> <message> + <location filename="../../../../QTfrontend/main.cpp" line="37"/> <source>OK</source> <translation>OK</translation> </message> @@ -506,93 +772,143 @@ <context> <name>QPushButton</name> <message> + <location filename="" line="0"/> <source>Waiting</source> - <translation>Väntar</translation> + <translation type="obsolete">Väntar</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Kör!</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="511"/> <source>default</source> <translation>standard</translation> </message> <message> + <location filename="../../../../QTfrontend/input_ip.cpp" line="52"/> <source>OK</source> <translation>OK</translation> </message> <message> + <location filename="../../../../QTfrontend/input_ip.cpp" line="57"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="392"/> <source>Start server</source> <translation>Starta server</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="408"/> <source>Connect</source> <translation>Kontakta</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="417"/> <source>Update</source> <translation>Uppdatera</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="422"/> <source>Specify</source> <translation>Specificera</translation> </message> <message> + <location filename="" line="0"/> <source>Back</source> - <translation>Tillbaka</translation> + <translation type="obsolete">Tillbaka</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="475"/> <source>Start</source> <translation>Starta</translation> </message> <message> + <location filename="" line="0"/> <source>Simple Game</source> - <translation>Enkelt spel</translation> + <translation type="obsolete">Enkelt spel</translation> </message> <message> + <location filename="" line="0"/> <source>Training</source> - <translation>Träning</translation> + <translation type="obsolete">Träning</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="75"/> <source>Play demo</source> <translation>Spela demo</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="48"/> <source>Rename</source> <translation>Döp om</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="52"/> <source>Delete</source> <translation>Radera</translation> </message> <message> + <location filename="../../../../QTfrontend/playrecordpage.cpp" line="80"/> <source>Load</source> <translation>Ladda</translation> </message> <message> + <location filename="../../../../QTfrontend/teamselect.cpp" line="236"/> <source>Setup</source> <translation>Upplägg</translation> </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="427"/> + <source>Join official server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="545"/> + <source>Ready</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QTableWidget</name> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> + <source>Room name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> + <source>Players number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> + <source>Round in progress</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QToolBox</name> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="209"/> <source>Actions</source> <translation>Manövrar</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="211"/> <source>Weapons</source> <translation>Vapen</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="213"/> <source>Weapon properties</source> <translation>Vapenegenskaper</translation> </message> <message> + <location filename="../../../../QTfrontend/pages.cpp" line="215"/> <source>Other</source> <translation>Annat</translation> </message> @@ -600,14 +916,17 @@ <context> <name>TCPBase</name> <message> + <location filename="../../../../QTfrontend/tcpBase.cpp" line="99"/> <source>Error</source> <translation>Fel</translation> </message> <message> + <location filename="../../../../QTfrontend/tcpBase.cpp" line="45"/> <source>Unable to start the server: %1.</source> <translation>Kan inte starta servern: %1.</translation> </message> <message> + <location filename="../../../../QTfrontend/tcpBase.cpp" line="101"/> <source>Unable to run engine: %1 (</source> <translation>Kan inte köra motorn: %1 (</translation> </message> @@ -615,139 +934,173 @@ <context> <name>binds</name> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="23"/> <source>up</source> <translation>upp</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="24"/> <source>left</source> <translation>vänster</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="25"/> <source>right</source> <translation>höger</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="26"/> <source>down</source> <translation>ned</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="28"/> <source>jump</source> <translation>hoppa</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="29"/> <source>attack</source> <translation>attackera</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="30"/> <source>put</source> <translation>placera</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="31"/> <source>switch</source> <translation>byt</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="32"/> <source>find hedgehog</source> <translation>hitta igelkott</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="33"/> <source>ammo menu</source> <translation>ammunitionsmeny</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="34"/> <source>slot 1</source> <translation>fack 1</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="35"/> <source>slot 2</source> <translation>fack 2</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="36"/> <source>slot 3</source> <translation>fack 3</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="37"/> <source>slot 4</source> <translation>fack 4</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="38"/> <source>slot 5</source> <translation>fack 5</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="39"/> <source>slot 6</source> <translation>fack 6</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="40"/> <source>slot 7</source> <translation>fack 7</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="41"/> <source>slot 8</source> <translation>fack 8</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="42"/> <source>slot 9</source> <translation>fack 9</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="43"/> <source>timer 1 sec</source> <translation>tidur 1 sek</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="44"/> <source>timer 2 sec</source> <translation>tidur 2 sek</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="45"/> <source>timer 3 sec</source> <translation>tidur 3 sek</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="46"/> <source>timer 4 sec</source> <translation>tidur 4 sek</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="47"/> <source>timer 5 sec</source> <translation>tidur 5 sek</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="50"/> <source>pause</source> <translation>pausa</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="52"/> <source>volume down</source> <translation>sänk volym</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="53"/> <source>volume up</source> <translation>höj volym</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="54"/> <source>change mode</source> <translation>byt skärmläge</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="55"/> <source>capture</source> <translation>spela in</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="56"/> <source>hedgehogs info</source> <translation>information om igelkottar</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="57"/> <source>quit</source> <translation>avsluta</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="48"/> <source>chat</source> <translation>chatt</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="49"/> <source>chat history</source> <translation>chatthistoria</translation> </message> <message> + <location filename="../../../../QTfrontend/binds.cpp" line="51"/> <source>confirmation</source> <translation>bekräftelse</translation> </message> @@ -755,110 +1108,137 @@ <context> <name>teams</name> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="53"/> <source>Hedgehogs</source> <translation>Igelkottar</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="54"/> <source>hedgehog 1</source> <translation>igelkott 1</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="55"/> <source>hedgehog 2</source> <translation>igelkott 2</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="56"/> <source>hedgehog 3</source> <translation>igelkott 3</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="57"/> <source>hedgehog 4</source> <translation>igelkott 4</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="58"/> <source>hedgehog 5</source> <translation>igelkott 5</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="59"/> <source>hedgehog 6</source> <translation>igelkott 6</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="60"/> <source>hedgehog 7</source> <translation>igelkott 7</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="61"/> <source>hedgehog 8</source> <translation>igelkott 8</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="73"/> <source>Goddess</source> <translation>Gudinna</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="74"/> <source>Isis</source> <translation>Isis</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="75"/> <source>Astarte</source> <translation>Astarte</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="76"/> <source>Diana</source> <translation>Diana</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="77"/> <source>Aphrodite</source> <translation>Afrodite</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="78"/> <source>Hecate</source> <translation>Hekate</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="79"/> <source>Demeter</source> <translation>Demeter</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="80"/> <source>Kali</source> <translation>Kali</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="81"/> <source>Inanna</source> <translation>Inanna</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="93"/> <source>Fruits</source> <translation>Frukter</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="94"/> <source>Banana</source> <translation>Banan</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="95"/> <source>Apple</source> <translation>Äpple</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="96"/> <source>Orange</source> <translation>Apelsin</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="97"/> <source>Lemon</source> <translation>Citron</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="98"/> <source>Pineapple</source> <translation>Ananas</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="99"/> <source>Mango</source> <translation>Mango</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="100"/> <source>Peach</source> <translation>Persika</translation> </message> <message> + <location filename="../../../../QTfrontend/predefteams.h" line="101"/> <source>Plum</source> <translation>Plommon</translation> </message> diff -r 89e24edb6020 -r c01512115c12 share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri Nov 07 22:03:43 2008 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Sat Nov 08 11:54:46 2008 +0000 @@ -169,27 +169,27 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="179"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="178"/> <source>Error</source> <translation>Помилка</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="172"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="171"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Помилка підключення. Перевірте ім'я серверу та номер порту.</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="176"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="175"/> <source>Connection refused</source> <translation>Відмовленно в з'єднанні</translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="319"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="325"/> <source>*** %1 joined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/newnetclient.cpp" line="331"/> + <location filename="../../../../QTfrontend/newnetclient.cpp" line="337"/> <source>*** %1 left</source> <translation type="unfinished"></translation> </message> @@ -396,37 +396,37 @@ <context> <name>PageRoomsList</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="685"/> + <location filename="../../../../QTfrontend/pages.cpp" line="689"/> <source>Create</source> <translation type="unfinished">Создать</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="686"/> + <location filename="../../../../QTfrontend/pages.cpp" line="690"/> <source>Join</source> <translation type="unfinished">Присоединиться</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="687"/> + <location filename="../../../../QTfrontend/pages.cpp" line="691"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="737"/> + <location filename="../../../../QTfrontend/pages.cpp" line="741"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="727"/> + <location filename="../../../../QTfrontend/pages.cpp" line="731"/> <source>Please, enter room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="739"/> + <location filename="../../../../QTfrontend/pages.cpp" line="743"/> <source>OK</source> <translation type="unfinished">ОК</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="738"/> + <location filename="../../../../QTfrontend/pages.cpp" line="742"/> <source>Please, select room from the list</source> <translation type="unfinished"></translation> </message> @@ -439,12 +439,12 @@ <translation type="obsolete">Назад</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="650"/> + <location filename="../../../../QTfrontend/pages.cpp" line="654"/> <source>Default</source> <translation>За замовчуванням</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="651"/> + <location filename="../../../../QTfrontend/pages.cpp" line="655"/> <source>Delete</source> <translation>Видалити</translation> </message> @@ -495,27 +495,27 @@ <translation type="obsolete">Демки</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="607"/> + <location filename="../../../../QTfrontend/pages.cpp" line="609"/> <source>Simple Game (a quick game against the computer, settings are chosen for you)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="610"/> + <location filename="../../../../QTfrontend/pages.cpp" line="612"/> <source>Multiplayer (play a hotseat game against your friends, or AI teams)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="613"/> + <location filename="../../../../QTfrontend/pages.cpp" line="617"/> <source>Training Mode (Practice your skills in a range of training missions). IN DEVELOPMENT</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="619"/> + <location filename="../../../../QTfrontend/pages.cpp" line="623"/> <source>Demos (Watch recorded demos)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="622"/> + <location filename="../../../../QTfrontend/pages.cpp" line="626"/> <source>Load (Load a previously saved game)</source> <translation type="unfinished"></translation> </message> @@ -928,22 +928,22 @@ <translation>З'єднання з сервером загублено</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Weapons</source> <translation>Зброя</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="158"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="154"/> <source>Can not delete default weapon set</source> <translation>Неможливо видалити набір зброї за замовчуванням</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="163"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="159"/> <source>Really delete this weapon set?</source> <translation>Видалити вибраний набір зброї?</translation> </message> <message> - <location filename="../../../../QTfrontend/selectWeapon.cpp" line="123"/> + <location filename="../../../../QTfrontend/selectWeapon.cpp" line="119"/> <source>Can not edit default weapon set</source> <translation>Неможливо редагувати набір зброї за замовчуванням</translation> </message> @@ -1064,7 +1064,7 @@ <translation type="obsolete">Добавить команду</translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="635"/> + <location filename="../../../../QTfrontend/pages.cpp" line="639"/> <source>Go!</source> <translation>Уперед!</translation> </message> @@ -1152,17 +1152,17 @@ <context> <name>QTableWidget</name> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="701"/> + <location filename="../../../../QTfrontend/pages.cpp" line="705"/> <source>Room name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="702"/> + <location filename="../../../../QTfrontend/pages.cpp" line="706"/> <source>Players number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/pages.cpp" line="704"/> + <location filename="../../../../QTfrontend/pages.cpp" line="708"/> <source>Round in progress</source> <translation type="unfinished"></translation> </message>