diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-30 03:46:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-30 03:46:59 +0300 |
| commit | ece00592ecd93f7a96db0ca82589d00846e2f938 (patch) | |
| tree | c36bde1e1a46d11ee47438d0debaa8317cd0db6e | |
| parent | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (diff) | |
| parent | 2c3c118c03ece5cad2b73affffbcbbc5a5746c7a (diff) | |
| download | plus-stripped1.1.10.30.tar.gz plus-stripped1.1.10.30.tar.bz2 plus-stripped1.1.10.30.tar.xz plus-stripped1.1.10.30.zip | |
Merge branch 'master' into strippedstripped1.1.10.30
46 files changed, 1506 insertions, 982 deletions
@@ -1,3 +1,14 @@ +2011-10-30 New release 1.1.10.30 +ManaPlus: +fix: disable autofix position for archer mode. +fix; hide password from packets log. +fix: replace tags without item id in items.xml. +fix: protect trades from some kind of abusing. +add: chat commands to use server side ignore for whispers: +Commands: /serverignoreall and /serverunignoreall +add: command for dump graphics and some other settings to chat. +Command: /dumpg + 2011-10-16 New release 1.1.10.16 ManaPlus: fix: particle effects Y position. @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.1.10.16 Date: 2011-10-16 + Version: 1.1.10.30 Date: 2011-10-30 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 268a7b0c7..846685c60 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT
===============
- Version: 1.1.10.16 Date: 2011-10-16
+ Version: 1.1.10.30 Date: 2011-10-30
Development team:
- See AUTHORS file for a list
diff --git a/build/packwin b/build/packwin index 81920b9fa..a817b5d4b 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.1.10.16" \ + -DPRODUCT_VERSION="1.1.10.30" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index b6130de3d..0a4027e9a 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.10.16], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.10.30], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/" "cs/)\n" @@ -141,15 +141,15 @@ msgstr "Chyba při vytváření adresáře s updaty!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Neznámý příkaz." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Nelze zaslat prázdné šeptání!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,101 +158,101 @@ msgstr "" "Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo " "jsi to ty." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Chybí jméno party." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Chybí jméno guildy." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Prosím zadej jméno." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Enter přepíná chat." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Zpráva zavírá chat." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Enter nyní přepíná chat." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Zpráva nyní ukončuje chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "přítel" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "přehlížený" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutrální" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Hráč je již %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Hráč byl úspěšně zařazen jako %s!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Hráč nemůže být zařazen jako %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Hráč nebyl ignorován!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Hráč již není ignorován!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Hráč nemůže být odignorován!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Hráč již byl vymazán!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Hráč byl úspěšně vymazán!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Hráč nemůže být vymazán!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Doba běhu klienta: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -260,7 +260,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" @@ -268,7 +268,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -276,7 +276,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -284,7 +284,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -292,27 +292,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "velikost chache fontů" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Velikost cache:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Vytvořeno:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Odstraněno:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -345,19 +345,19 @@ msgstr "Spojení se serverem bylo ztraceno." msgid "Network Error" msgstr "Chyba sítě" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignorovat příchozí žádosti o obchodování" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Akceptovat příchozí žádosti o obchodování" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Nelze načíst mapu" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Chyba při načítání %s" @@ -741,12 +741,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Přítomno: %s; %d hráčů je přítomno." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Šeptání pro %s: %s" @@ -4313,7 +4313,7 @@ msgstr "" msgid "Imitation canceled" msgstr "Imitace zrušena." -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Vidíte " @@ -4516,6 +4516,22 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5089,53 +5105,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "" -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "" @@ -5558,11 +5574,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/" "de/)\n" @@ -144,15 +144,15 @@ msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Unbekannter Befehl." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Kann keine leeren Nachrichten versenden!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -161,156 +161,156 @@ msgstr "" "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, " "oder du bist es selbst." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Anfrage den Kanal %s betreten zu dürfen." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Name der Party fehlt." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Name der Gilde fehlt." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Bitte gib einen Namen an." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Nachricht schließt den Chat." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Enter aktiviert jetzt den Chat." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Nachricht schließt jetzt den Chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "Freund" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "unbeachtet" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Spieler ist bereits %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Spieler erfolgreich %s!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Spieler konnte nicht %s werden!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Spieler wurde nicht ignoriert!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Spieler wird nicht länger ignoriert!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Spieler ist bereits gelöscht!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Spieler erfolgreich gelöscht!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Spieler konnte nicht gelöscht werden!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -344,19 +344,19 @@ msgstr "Die Verbindung zum Server wurde getrennt." msgid "Network Error" msgstr "Netzwerkfehler" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignoriere eingehende Handelsanfragen" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Akzeptiere eingehende Handelsanfragen" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Karte konnte nicht geladen werden." -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Fehler beim Laden von %s" @@ -740,12 +740,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Anwesend: %s ;%d Spieler sind anwesend." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Flüsternd zu %s: %s" @@ -4319,7 +4319,7 @@ msgstr "" msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Du siehst" @@ -4520,6 +4520,22 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5094,53 +5110,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "%s möchte mit dir handeln, stimmst du zu?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Handel abgebrochen." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Handel abgeschlossen." @@ -5566,11 +5582,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "Empty address given to Network::connect()!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Nicht möglich den host \" aufzulösen" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Verbindung mit Server abgebrochen. " @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-15 05:26+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-29 03:29+0000\n" "Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" "manaplus/team/es/)\n" @@ -143,15 +143,15 @@ msgstr "¡Error al crear la carpeta de actualizaciones!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Comando desconocido." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "¡No puedes enviar susurros vacíos!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,156 +160,156 @@ msgstr "" "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya " "existe, o eres tú." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando la entrada del canal %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta el nombre del grupo." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Falta el nombre del Clan." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Por favor, especifique un nombre." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Volver a alternar el chat." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Mensaje cierra la charla." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Volver ahora a cambiar de chat." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Mensaje ahora cierra el chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "desatendido" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutral" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "¡Jugador ya es %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "¡Jugador %s exitosamente!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "¡Jugador no pudo ser %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "El jugador no estaba ignorado!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "¡El jugador ya no es ignorado!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "¡Al jugador no se le puede dejar de ignorar!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "en la lista negra" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "¡Jugador ya borrado!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "¡Jugador borrado con éxito!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "¡Jugador no pudo ser borrado!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Tiempo de actividad del cliente: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d día" msgstr[1] "%d días" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "tamaño de caché de fuente" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Tám. caché:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Creado:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Borrado:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Imágenes de recurso:" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "Imágenes de recurso huérfano:" @@ -343,19 +343,19 @@ msgstr "Se ha perdido la conexión con el servidor." msgid "Network Error" msgstr "Error de Red" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignorando las peticiones de intercambio" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Aceptando las peticiones de intercambio" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "No se pudo cargar el mapa" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Error mientras cargaba %s" @@ -739,12 +739,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jugadores estan presentes." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Susurrando a %s: %s" @@ -4315,7 +4315,7 @@ msgstr "Imitacion: " msgid "Imitation canceled" msgstr "Imitación cancelada" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Ves " @@ -4516,6 +4516,22 @@ msgstr "Jugador VIP." msgid "MVP player: " msgstr "Jugador MVP: " +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "Todos los susurros ignorados." + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "Ignorar todos los susurros ha fallado." + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "Todos los susurros des-ignorados." + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "Ignorar todos los susurros ha fallado." + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5104,54 +5120,54 @@ msgstr "Veneno no tuvo ningún efecto..." msgid "%s wants to trade with you, do you accept?" msgstr "%s quiere comerciar contigo, aceptas?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" "No es posible realizar el Intercambio. El otro personaje está muy alejado." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "El intercambio no es posible. El personaje no existe." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Intercambio cancelado por una razón desconocida." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Intercambio: Tú y %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Intercambio con %s cancelado." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "Intercambio no soportado." -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "Error al añadir objeto. El otro jugador lleva mucho peso." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "Error al añadir objeto. El otro jugador no tiene más espacio." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Fallo al anadir objeto por una razón desconocida." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Intercambio Cancelado." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Intercambio Realizado." @@ -5578,11 +5594,11 @@ msgstr "Daño por segundo." msgid "Empty address given to Network::connect()!" msgstr "Adress vacía enviada a Network::connect()!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "No es posible determinar el host \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Conexión al servidor terminada." @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: fi\n" @@ -139,15 +139,15 @@ msgstr "Päivityshakemistoa luodessa tapahtui virhe!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Tuntematon komento." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Et voi lähettää tyhjiä kuiskauksia!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -156,156 +156,156 @@ msgstr "" "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai " "käytit omaa nimeäsi." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Pyyntö liittyä kanavalle %s lähetetty." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ryhmän nimi puuttuu." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Killan nimi puuttuu." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Anna nimi." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Viesti sulkee keskustelun." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Nyt viesti sulkee keskustelun." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "ystävä" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "vaimennettu" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutraali" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Pelaaja on jo %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Pelaaja on nyt %s." -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Pelaajaa ei ollut jätetty huomiotta!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Pelaaja huomioidaan taas." -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Pelaajan uudelleenhuomiointi epäonnistui." -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Pelaaja on jo pyyhitty!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Pelaaja pyyhitty." -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty." -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Ohjelma ollut käynnissä: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d viikon" msgstr[1] "%d viikkoa" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d päivän" msgstr[1] "%d päivää" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d tunnin" msgstr[1] "%d tuntia" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuutin" msgstr[1] "%d minuuttia" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d sekunnin" msgstr[1] "%d sekuntia" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "kirjasinvälimuistin koko" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Välimuistin koko:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Luotu:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Poistettu:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Resurssikuvat:" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "Orvot resurssikuvat:" @@ -340,19 +340,19 @@ msgstr "Yhteys palvelimeen katkesi." msgid "Network Error" msgstr "Verkkovirhe" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Et huomioi kaupankäyntipyyntöjä" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Hyväksyt kaupankäyntipyynnöt" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Kartan lataaminen epäonnistui" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Kohdetta %s ladattaessa tapahtui virhe." @@ -736,12 +736,12 @@ msgstr "???" msgid "Chat" msgstr "Keskustelu" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Läsnä: %s; %d pelaajaa paikalla." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Kuiskaat pelaajalle %s: %s" @@ -4309,7 +4309,7 @@ msgstr "Matki: " msgid "Imitation canceled" msgstr "Matkiminen keskeytetty" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Näet " @@ -4511,6 +4511,22 @@ msgstr "MVP-pelaaja." msgid "MVP player: " msgstr "MVP-pelaaja: " +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5092,54 +5108,54 @@ msgstr "Myrkyllä ei ollut vaikutusta..." msgid "%s wants to trade with you, do you accept?" msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Kaupanteko keskeytyi tuntemattomasta syystä." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Kauppa: sinä ja %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Kaupanteko pelaajan %s kanssa peruttu." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "Käsittelemätön kaupan peruutus -paketti." -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" "Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Kaupat peruttu." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Kaupat tuli." @@ -5566,11 +5582,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "Tyhjä osoite Network::connect()-pyynnössä!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Osoitetta ei löydy: \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Yhteys palvelimeen katkaistu. " @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-15 00:41+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 22:46+0000\n" "Last-Translator: reid <reidyaro@gmail.com>\n" "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/" "fr/)\n" @@ -144,15 +144,15 @@ msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Commande inconnue." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Vous ne pouvez pas envoyer de messages vides." -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -161,157 +161,157 @@ msgstr "" "Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s" "\". Soit elle existe déjà, soit il s'agit de vous même." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Demande de rejoindre le canal %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Le nom du groupe est manquant." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Le nom de la guilde est manquant." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Veuillez indiquer un nom." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "La touche <entrée> ferme la ligne d'entrée du chat." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Le message ferme la conversation." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "" "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Le message ferme maintenant la conversation." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "ami" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "écarté" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutre" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Joueur déjà %s !" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Joueur %s avec succès!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Le joueur n'a pas pu %s !" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Le joueur n'était pas ignoré !" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Le joueur n'est plus ignoré !" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "sous liste noir" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Joueur déjà effacé !" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Joueur éliminé avec succès !" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "le joueur n'a pas pu être effacé !" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Heure de lancement du client : %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d secondes" msgstr[1] "%d secondes" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "Taille du cache de polices" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Dimension du cache :" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Créé : " -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Effacé :" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Images des ressources :" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "Images des ressources non affectées :" @@ -346,19 +346,19 @@ msgstr "" msgid "Network Error" msgstr "Erreur Réseau" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignorer les requêtes d'échanges entrantes" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Accepter les requêtes d'échanges entrantes" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "La carte n'a pu être chargée" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Erreur durant le chargement %s" @@ -742,12 +742,12 @@ msgstr "???" msgid "Chat" msgstr "Conversation" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Présents : %s ; %d joueurs sont présents." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Message envoyé à %s : %s" @@ -4332,7 +4332,7 @@ msgstr "Imitation: " msgid "Imitation canceled" msgstr "Imitation annulée" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Vous voyez " @@ -4542,6 +4542,22 @@ msgstr "Joueur MVP" msgid "MVP player: " msgstr "MVP joueur :" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "Tous les chuchotements sont passés sous silence." + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "La mise en silence de tout les chuchotements a échoué" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "Tous les chuchotements ne sont plus sous silence." + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "La remise en activité de tout les chuchotements a échoué" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5138,57 +5154,57 @@ msgstr "Le poison fut sans effet..." msgid "%s wants to trade with you, do you accept?" msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "L'échange est impossible. Votre partenaire est trop éloigné." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "Échange impossible. Ce personnage n'existe pas." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Échange annulé pour une raison inconnue." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Échange : Vous et %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Échange avec %s annulé." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "Échange non pris en compte." -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" "Impossible de rajouter un objet. Votre partenaire pour cet échange est " "surchargé." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus " "de place libre." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Impossible de rajouter un objet pour une raison inconnue." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Échange annulé." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Échange finalisé." @@ -5619,11 +5635,11 @@ msgstr "Dommage par s." msgid "Empty address given to Network::connect()!" msgstr "Une adresse vide a été donnée à la commande Network::connect() !" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Impossible de connecter au serveur \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Connexion au serveur terminée." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" "PO-Revision-Date: 2011-08-09 22:16+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -138,15 +138,15 @@ msgstr "" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Nepoznata naredba." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Ne mogu poslati prazan šapate!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -155,101 +155,101 @@ msgstr "" "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to " "vi." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Zahtjev za pridruživanje kanalu %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Ime partije nedostaje." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Poruka zatvara chat." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Poruka sada zatvara chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -257,7 +257,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" @@ -265,7 +265,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -273,7 +273,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -281,7 +281,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -289,27 +289,27 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -342,19 +342,19 @@ msgstr "" msgid "Network Error" msgstr "Mreža Greška" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignoriranje dolaznih zahtjeva za trgovanje" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Greška prilikom učitavanja %s" @@ -739,12 +739,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Šaptaj prema %s: %s" @@ -4310,7 +4310,7 @@ msgstr "" msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "" @@ -4511,6 +4511,26 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +#, fuzzy +msgid "All whispers ignored." +msgstr "Dozvoli šapate" + +#: src/net/ea/chathandler.cpp:374 +#, fuzzy +msgid "All whispers ignore failed." +msgstr "Stavi sve šapate u kartice" + +#: src/net/ea/chathandler.cpp:385 +#, fuzzy +msgid "All whispers unignored." +msgstr "Dozvoli šapate" + +#: src/net/ea/chathandler.cpp:389 +#, fuzzy +msgid "All whispers unignore failed." +msgstr "Stavi sve šapate u kartice" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5080,53 +5100,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "%s želi trgovati s vama, prihvaćate li?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Otkazano trgovanje." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Trgovanje je završeno." @@ -5549,11 +5569,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" "PO-Revision-Date: 2011-08-09 22:16+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -137,15 +137,15 @@ msgstr "Hiba a frissítési könyvtár létrehozása közben!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Ismeretlen parancs." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Nem küldhetsz üres üzenetet!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -153,156 +153,156 @@ msgid "" msgstr "" "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Kapcsolódási kérelem a %s nevű csatornába." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "A csapatnév hiányzik." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Az enter megnyitja a bevitelt." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Az üzenet bezárja a bevitelt." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Az enter mostantól megnyitja a bevitelt." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Az üzenet mostantól bezárja a bevitelt." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -337,19 +337,19 @@ msgstr "" msgid "Network Error" msgstr "Hálózati hiba" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Kereskedési kérelmek elutasítása" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Kereskedési kérelmek elfogadása" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Hiba %s betöltése közben" @@ -734,12 +734,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Üzenet %s számára: %s" @@ -4304,7 +4304,7 @@ msgstr "" msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "" @@ -4505,6 +4505,26 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +#, fuzzy +msgid "All whispers ignored." +msgstr "Privát engedélyezése" + +#: src/net/ea/chathandler.cpp:374 +#, fuzzy +msgid "All whispers ignore failed." +msgstr "Privátok fülekbe tétele" + +#: src/net/ea/chathandler.cpp:385 +#, fuzzy +msgid "All whispers unignored." +msgstr "Privát engedélyezése" + +#: src/net/ea/chathandler.cpp:389 +#, fuzzy +msgid "All whispers unignore failed." +msgstr "Privátok fülekbe tétele" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5076,53 +5096,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "%s üzletelni akar veled. Te akarsz vele?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Az üzlet megszakadt." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Sikeres üzlet." @@ -5545,11 +5565,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/" "id/)\n" @@ -141,15 +141,15 @@ msgstr "Gagal membuat direktori update!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Perintah tidak dikenal." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Tidak dapat mengirimkan pesan tanpa nama" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,151 +158,151 @@ msgstr "" "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, " "atau nama anda sendiri" -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Meminta untuk masuk ke channel %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Nama kelompok tidak dapat di temukan" -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Nama organisasi tidak ditemukan." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Tetapkan sebuah nama" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Kembalikan pengalihan obrolan" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Tutup pesan obrolan" -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Kembalikan sekarang pengalihan obrolan" -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Pesan menutup obrolan" -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "Teman" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "Diabaikan" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "netral" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Pemain telah %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Pemain telah berhasil %s!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Pemain tidak bisa %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Pemain tidak diabaikan!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Pemain tidak lagi diabaikan!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Pemain tidak dapat diabaikan" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Pemain telah terhapus" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Pemain telah berhasil dihapus" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Pemain tidak dapat dihapus" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "Ukuran jenis huruf cache" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Ukuran Cache:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Buat" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Hapus" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Sumber gambar" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -336,19 +336,19 @@ msgstr "Koneksi ke server terputus" msgid "Network Error" msgstr "Kesalahan jaringan" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Abaikan permohonan transaksi" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Terima permohonan transaksi" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Tidak dapat menampilkan peta" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Error ketika menunggu %s" @@ -732,12 +732,12 @@ msgstr "???" msgid "Chat" msgstr "Obrolan" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Kehadiran: %s; %d pemain yang hadir." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Berbisik ke %s: %s" @@ -4292,7 +4292,7 @@ msgstr "Tirukan:" msgid "Imitation canceled" msgstr "Batal menirukan" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "" @@ -4493,6 +4493,22 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5062,53 +5078,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "" -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "" @@ -5531,11 +5547,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n" "MIME-Version: 1.0\n" @@ -141,15 +141,15 @@ msgstr "Errore durante la creazione della directory degli aggiornamenti" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Comando sconosciuto." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Impossibile inviare un sussurro vuoto!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is" @@ -158,156 +158,156 @@ msgstr "" "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure " "sei tu." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Richiesta per accedere al canale %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Manca il nome del party." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Manca il nome della gilda." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Prego specificare un nome." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Invio attiva/disattiva la conversazione." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "I messaggi chiudono la conversazione." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "\"Invio\" adesso attiva/disattiva la conversazione." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "I messaggi adesso chiudono la conversazione." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "Amico" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "Disprezzato" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "Neutro" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Giocatore già %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Giocatore %s con successo!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Player non può essere %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Il giocatore non era ignorato!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Giocatore non più ignorato!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Impossibile annullare l'ignoro!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Il giocatore è già cancellato!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Giocatore cancellato dal tuo schermo con successo!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Il giocatore non può essere cancellato!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -342,19 +342,19 @@ msgstr "La connessione al server è stata persa." msgid "Network Error" msgstr "Errore di rete" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno ignorate" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Le richieste di scambio in arrivo saranno accettate" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Impossibile caricare la mappa." -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Errore durante il caricamento di %s" @@ -738,12 +738,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Presente: %s; %d giocatori sono presenti." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Sussurra a %s: %s" @@ -4309,7 +4309,7 @@ msgstr "" msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "" @@ -4510,6 +4510,22 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5083,53 +5099,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "%s vuole commerciare con te, accetti?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Scambio cancellato." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Scambio completato." @@ -5552,11 +5568,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/" "ja/)\n" @@ -142,15 +142,15 @@ msgstr "更新フォルダの作成エラー" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "エラー： %s は存在しないので作成することが不可能！終了中…" -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "不明なコマンド" -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "空のメッセージを送信することはできません！" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -159,151 +159,151 @@ msgstr "" "%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分" "です。" -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "%sというチャンネルへの参加を要求しています。" -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "パーティ名がない。" -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "ギルド名がない。" -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "名前を教えてください。" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "リターンはチャットを留めておきます。" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "メッセージはチャットを閉じます。" -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "リターンはこれからチャットを留めておきます。" -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "メッセージはこれからチャットを閉じます。" -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "友達" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "無視" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "中性" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "プレイヤーはもう%s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "プレイヤーは%s成功！" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "選手は%sを居られなかった " -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "プレイヤーは無視されなかった！" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "プレイヤーはもう無視していない！" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Playerはunignoredことができなかった！" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "プレイヤーはもう消している!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "プレーアが首尾よくに消去！" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "クライアントの稼働時間：%s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -338,19 +338,19 @@ msgstr "" msgid "Network Error" msgstr "ネットワークエラー" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "他人からのトレードリクエストを無視します。" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "他人からのトレードリクエストを受け入れます。" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "マップをロードできませんでした" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "%sをロードしている間にエラーが起きました。" @@ -734,12 +734,12 @@ msgstr "???" msgid "Chat" msgstr "チャット" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "%sに送信中： %s" @@ -4303,7 +4303,7 @@ msgstr "擬い: " msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "あなた" @@ -4504,6 +4504,22 @@ msgstr "プレイヤー MVP" msgid "MVP player: " msgstr "プレイヤー MVP " +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5081,53 +5097,53 @@ msgstr "毒は不効果" msgid "%s wants to trade with you, do you accept?" msgstr "%sはあなたと取引したいみたいが、応じる？" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "取引は不可能。取引の相手は遠すぎる。" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "取引は不可能。本キャラが存在していない。" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "不明な理由で取引が中止された。" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "あなたと%sとの取引" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "%sとの取引が中止された。" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "できなかった取引キャンセルパケット" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "アイテム追加失敗。相手の空いているスロットはない。" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "不明な理由でアイテム追加失敗" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "取引中止" -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "取引完了" @@ -5550,11 +5566,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "ホスト名を解決できません。" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" diff --git a/po/manaplus.pot b/po/manaplus.pot index f141b3248..a7a34c90e 100644 --- a/po/manaplus.pot +++ b/po/manaplus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -138,171 +138,171 @@ msgstr "" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "" -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "" -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "" -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "" -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "" -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "" -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "" -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "" -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "" -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -335,19 +335,19 @@ msgstr "" msgid "Network Error" msgstr "" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "" @@ -731,12 +731,12 @@ msgstr "" msgid "Chat" msgstr "" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "" @@ -4294,7 +4294,7 @@ msgstr "" msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "" @@ -4495,6 +4495,22 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5062,53 +5078,53 @@ msgstr "" msgid "%s wants to trade with you, do you accept?" msgstr "" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "" -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "" @@ -5531,11 +5547,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index 748c3fb5b..09fb798ab 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/" "manaplus/team/nl_BE/)\n" @@ -140,15 +140,15 @@ msgstr "Fout bij het creëren van de update map!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Onbekend commando." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Kan geen lege berichten sturen!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -157,156 +157,156 @@ msgstr "" "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds " "bestaat, of het is jezelf." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Aanvragen om bij kanaal %s toegevoegd te worden." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Groepsnaam ontbreekt." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Guild-naam ontbreekt." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Gelieve een naam te specifiëren" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Ga terug naar chat" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Bericht sluit chat." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Ga nu terug naar chat." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Bericht sluit nu chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "vriend" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "genegeerd" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutraal" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Speler reeds %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Speler succesvol %s!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Speler kan niet %s zijn!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Speler is niet genegeerd!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Speler niet langer genegeerd!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Speler kan niet worden genegeerd!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Speler reeds verwijderd!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Speler succesvol verwijderd!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Speler kan niet worden verwijderd!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Client uptime: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d seconden" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Aangemaakt:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Verwijdered:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -340,19 +340,19 @@ msgstr "De verbinding met de server is verbroken." msgid "Network Error" msgstr "Netwerkfout" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Inkomende handelsaanvragen negeren" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Inkomende handelsaanvragen accepteren" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Kon Map Niet Laden" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Fout bij het laden van %s" @@ -736,12 +736,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Aanwezig: %s; %d speler zijn aanwezig." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Fluisteren naar %s: %s" @@ -4318,7 +4318,7 @@ msgstr "Imitatie: " msgid "Imitation canceled" msgstr "Imitatie onderbroken" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "" @@ -4521,6 +4521,22 @@ msgstr "" msgid "MVP player: " msgstr "" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5107,54 +5123,54 @@ msgstr "Gif had geen effect..." msgid "%s wants to trade with you, do you accept?" msgstr "%s wil met jou handelen, aanvaard je dit?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Handelen is niet mogelijk. Partner is te ver weg." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "Handelen is niet mogelijk. Personage bestaat niet." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Handel onderbroken vanwege een onbekende reden." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Handelen: Jij en %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Handel met %s geannuleerd." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "" "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Kan voorwerp niet toevoegen voor een onbekende reden." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Handel geannuleerd." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Handel voltooid." @@ -5578,11 +5594,11 @@ msgstr "" msgid "Empty address given to Network::connect()!" msgstr "Leeg adres gegeven aan Network::connect()!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Niet mogelijk te resolven van host \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Verbinding met server beëindigd. " @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-15 02:55+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-29 02:01+0000\n" "Last-Translator: freya <freya.df@gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/" "pt/)\n" @@ -141,15 +141,15 @@ msgstr "Erro ao criar pasta de atualizações!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Não é possível enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -158,156 +158,156 @@ msgstr "" "Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela " "já existe ou é você mesmo." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Não foi possível deixar de ignorar o jogador!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "Na Lista Negra" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "Tamanho do cache de fonte" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Tamanho de Cache:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Recursos de imagens:" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "Recursos de imagens orfãos:" @@ -341,19 +341,19 @@ msgstr "A conexão com o servidor caiu." msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Não foi possível carregar o mapa" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -737,12 +737,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -4310,7 +4310,7 @@ msgstr "Imitando:" msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Você vê " @@ -4515,6 +4515,22 @@ msgstr "Jogador VIP." msgid "MVP player: " msgstr "Jogador VIP: " +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "Todos sussurros ignorados. " + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "Todos sussurros ignorados falharam. " + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "Todos sussurros não-ignorados. " + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "Todos sussurros não-ignorados falharam. " + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5102,53 +5118,53 @@ msgstr "Veneno não surtiu efeito..." msgid "%s wants to trade with you, do you accept?" msgstr "%s quer negociar com você, você aceita?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Negociação impossível. O parceiro de negócios está muito longe." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "Negociação impossível. O personagem não existe." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Negociação cancelada devido a uma razão desconhecida." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Negociação: Você e %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Negociação com %s cancelada." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "Troca injusta pacote cancelado." -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Falha ao adicionar item. Você não pode trocar este item." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Erro ao adicionar item devido a um motivo desconhecido." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Negociação cancelada." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Negociação realizada." @@ -5573,11 +5589,11 @@ msgstr "Dano por seg." msgid "Empty address given to Network::connect()!" msgstr "Endereço vazio enviado para Network::connect()!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Não foi possível determinar o host \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Conexão com o servidor interrompida. " diff --git a/po/pt_BR.po b/po/pt_BR.po index e13e5acfe..e4f04c9b3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-15 02:52+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-29 01:59+0000\n" "Last-Translator: freya <freya.df@gmail.com>\n" "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/" "manaplus/team/pt_BR/)\n" @@ -143,15 +143,15 @@ msgstr "Erro ao criar pasta de atualizações!" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Erro: %s não existe e não pode se criado! Saindo." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Comando desconhecido." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Não é possível enviar mensagens privadas vazias!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,156 +160,156 @@ msgstr "" "Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela " "já existe ou é você mesmo." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Solicitando entrada no canal %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Falta o nome do grupo." -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Falta o nome da guilda." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Por favor, especifique um nome." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Enter alterna para o chat." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "A mensagem fecha o chat." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Agora Enter alterna para o chat." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Agora a mensagem fecha o chat." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "amigo" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "ignorado" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "neutro" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Jogador já %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Jogador %s com sucesso!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Jogador não pode ser %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "O jogador não estava ignorado!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "O jogador não está mais ignorado!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Não foi possível deixar de ignorar o jogador!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "Na Lista Negra" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Jogador já apagado!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Jogador apagado com sucesso!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Jogador não pode ser apagado!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Uptime do cliente: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "Tamanho de fonte Cache" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Tamanho de cache:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Criado:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Deletado:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Recursos de imagem:" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "Recurso de imagem orfão:" @@ -343,19 +343,19 @@ msgstr "A conexão com o servidor caiu." msgid "Network Error" msgstr "Erro de conexão" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Ignorando propostas de negócios" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Aceitando propostas de negócios" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Não foi possível carregar o mapa" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Erro ao carregar %s" @@ -739,12 +739,12 @@ msgstr "???" msgid "Chat" msgstr "Chat" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" @@ -4312,7 +4312,7 @@ msgstr "Imitando:" msgid "Imitation canceled" msgstr "Imitação cancelada" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Você vê " @@ -4517,6 +4517,22 @@ msgstr "Jogador VIP." msgid "MVP player: " msgstr "Jogador VIP: " +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "Todos sussurros ignorados. " + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "Todos sussurros ignorados falharam. " + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "Todos sussurros não-ignorados." + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "Todos sussurros não-ignorados falharam. " + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5104,53 +5120,53 @@ msgstr "Veneno não surtiu efeito..." msgid "%s wants to trade with you, do you accept?" msgstr "%s quer negociar com você, você aceita?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Negociação impossível. O parceiro de negócios está muito longe." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "Negociação impossível. O personagem não existe." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Negociação cancelada devido a uma razão desconhecida." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Negociação: Você e %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Negociação com %s cancelada." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "Troca injusta pacote cancelado." -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Falha ao adicionar item. Você não pode trocar este item." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Erro ao adicionar item devido a um motivo desconhecido." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Negociação cancelada." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Negociação realizada." @@ -5575,11 +5591,11 @@ msgstr "Dano por seg." msgid "Empty address given to Network::connect()!" msgstr "Endereço vazio enviado para Network::connect()!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Não foi possível determinar o host \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Conexão com o servidor interrompida. " @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:13+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:58+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/" "ru/)\n" @@ -143,15 +143,15 @@ msgstr "Ошибка создания директории для обновле msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "Ошибка: %s не существует, и не может быть создан! Выход." -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "Неизвестная команда." -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "Нельзя отправлять пустые сообщения!" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " @@ -160,101 +160,101 @@ msgstr "" "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка " "уже создана, или этот игрок Вы сами." -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "Запрос на присоединение к каналу %s." -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "Не указано название группы" -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "Не задано имя гильдии." -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "Пожалуйста, укажите имя" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "Enter переключает Вас на окно чата." -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "Сообщение закрывает чат." -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "Теперь Return переключает чат." -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "Теперь сообщение закрывает чат." -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "друг" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "пренебрегаемый" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "нейтральный" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "Игрок уже %s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "Игрок удачно %s!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "Игрок не может быть %s!" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "Игрок не был игнорируемым!" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "Игрок больше не игнорируется!" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "Игрок не может быть удален из списка игнорирования!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "добавлен в черный список" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "Игрок и так уже удален!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "Игрок удален!" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "Игрок не может быть удален!" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "Время работы клиента: %s" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" @@ -262,7 +262,7 @@ msgstr[0] "%d неделя" msgstr[1] "%d недели" msgstr[2] "%d недель" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" @@ -270,7 +270,7 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -278,7 +278,7 @@ msgstr[0] "%d час" msgstr[1] "%d часа" msgstr[2] "%d часов" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -286,7 +286,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минуты" msgstr[2] "%d минут" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -294,27 +294,27 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "размер кеша шрифта" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "Размер кеша:" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "Создано:" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "Удалено:" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "Изображений:" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "Удаленных изображений:" @@ -349,19 +349,19 @@ msgstr "Соединение с сервером потеряно." msgid "Network Error" msgstr "Ошибка сети" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "Игнорировать предложения о торговле" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "Принимать предложения о торговле" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "Не удалось загрузить карту" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "Ошибка во время загрузки %s" @@ -745,12 +745,12 @@ msgstr "???" msgid "Chat" msgstr "Чат" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "Присутствуют: %s; Всего %d игроков." -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "Вы прошептали %s: %s" @@ -4330,7 +4330,7 @@ msgstr "Имитация: " msgid "Imitation canceled" msgstr "Имитация отменена" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "Вы видите " @@ -4533,6 +4533,22 @@ msgstr "Игрок MVP." msgid "MVP player: " msgstr "Игрок MVP: " +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "Включено игнорирование всех приватных сообщений." + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "Не удалось игнорирование всех приватных сообщение." + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "Убрано игнорирование всех приватных сообщений." + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "Не удалось убрать игнорирование всех приватных сообщение." + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5114,53 +5130,53 @@ msgstr "Яд не подействовал..." msgid "%s wants to trade with you, do you accept?" msgstr "%s хочет торговать с Вами, Вы принимаете предложение?" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "Торговля невозможна. Партнер по торговле слишком далеко." -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "Торговля невозможна. Такой персонаж не существует." -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "Торговля отменена по неизвестной причине." -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "Торговля: Вы и %s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "Торговля с %s отменена." -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "Неизвестный сигнал завершения торговли." -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "Не удалось добавить предмет. Партнер по торговле перегружен." -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место." -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "Не удалось добавить предмет по неизвестной причине." -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "Торговля отменена." -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "Торговля завершена." @@ -5589,11 +5605,11 @@ msgstr "Урон в сек." msgid "Empty address given to Network::connect()!" msgstr "Пустой адрес был передан методу Network::connect()!" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "Не удалось найти хост \"" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "Подключение к серверу прервано." diff --git a/po/zh_CN.po b/po/zh_CN.po index 135d763bb..171477632 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2011-10-15 00:08+0300\n" -"PO-Revision-Date: 2011-10-14 21:11+0000\n" +"POT-Creation-Date: 2011-10-28 03:52+0300\n" +"PO-Revision-Date: 2011-10-28 00:55+0000\n" "Last-Translator: akaras <akaras@inbox.ru>\n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/" "team/zh_CN/)\n" @@ -141,166 +141,166 @@ msgstr "创建更新目录错误！" msgid "Error: %s doesn't exist and can't be created! Exiting." msgstr "错误：%s 不存在并且无法创建！退出。" -#: src/commandhandler.cpp:198 +#: src/commandhandler.cpp:205 msgid "Unknown command." msgstr "未知命令。" -#: src/commandhandler.cpp:297 +#: src/commandhandler.cpp:304 msgid "Cannot send empty whispers!" msgstr "无法发送空白密语！" -#: src/commandhandler.cpp:311 +#: src/commandhandler.cpp:318 #, c-format msgid "" "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is " "you." msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。" -#: src/commandhandler.cpp:331 +#: src/commandhandler.cpp:338 #, c-format msgid "Requesting to join channel %s." msgstr "请求加入频道%s。" -#: src/commandhandler.cpp:347 src/net/ea/gui/partytab.cpp:125 +#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125 msgid "Party name is missing." msgstr "帮会名称缺失。" -#: src/commandhandler.cpp:358 +#: src/commandhandler.cpp:365 msgid "Guild name is missing." msgstr "公会名称是缺少的。" -#: src/commandhandler.cpp:371 src/commandhandler.cpp:483 -#: src/commandhandler.cpp:524 src/commandhandler.cpp:559 +#: src/commandhandler.cpp:378 src/commandhandler.cpp:496 +#: src/commandhandler.cpp:537 src/commandhandler.cpp:572 msgid "Please specify a name." msgstr "请指定一个名称。" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Return toggles chat." msgstr "" -#: src/commandhandler.cpp:417 +#: src/commandhandler.cpp:430 msgid "Message closes chat." msgstr "讯息关闭聊天。" -#: src/commandhandler.cpp:428 +#: src/commandhandler.cpp:441 msgid "Return now toggles chat." msgstr "<回车>键现在切换聊天。" -#: src/commandhandler.cpp:434 +#: src/commandhandler.cpp:447 msgid "Message now closes chat." msgstr "讯息现在关闭聊天。" -#: src/commandhandler.cpp:462 +#: src/commandhandler.cpp:475 msgid "friend" msgstr "朋友" -#: src/commandhandler.cpp:467 +#: src/commandhandler.cpp:480 msgid "disregarded" msgstr "无视" -#: src/commandhandler.cpp:472 +#: src/commandhandler.cpp:485 msgid "neutral" msgstr "中性" -#: src/commandhandler.cpp:491 +#: src/commandhandler.cpp:504 #, c-format msgid "Player already %s!" msgstr "玩家已经%s!" -#: src/commandhandler.cpp:505 +#: src/commandhandler.cpp:518 #, c-format msgid "Player successfully %s!" msgstr "玩家成功%s!" -#: src/commandhandler.cpp:513 +#: src/commandhandler.cpp:526 #, c-format msgid "Player could not be %s!" msgstr "玩家不能为 %s" -#: src/commandhandler.cpp:536 +#: src/commandhandler.cpp:549 msgid "Player wasn't ignored!" msgstr "是不能忽视的！" -#: src/commandhandler.cpp:543 +#: src/commandhandler.cpp:556 msgid "Player no longer ignored!" msgstr "玩家不再被忽略！" -#: src/commandhandler.cpp:545 +#: src/commandhandler.cpp:558 msgid "Player could not be unignored!" msgstr "玩家不能被忽略!" -#: src/commandhandler.cpp:551 +#: src/commandhandler.cpp:564 msgid "blacklisted" msgstr "" -#: src/commandhandler.cpp:566 +#: src/commandhandler.cpp:579 msgid "Player already erased!" msgstr "玩家已经被删除!" -#: src/commandhandler.cpp:577 +#: src/commandhandler.cpp:590 msgid "Player successfully erased!" msgstr "玩家成功删除！" -#: src/commandhandler.cpp:579 +#: src/commandhandler.cpp:592 msgid "Player could not be erased!" msgstr "玩家无法删除！" -#: src/commandhandler.cpp:879 src/commandhandler.cpp:925 +#: src/commandhandler.cpp:892 src/commandhandler.cpp:938 #, c-format msgid "Client uptime: %s" msgstr "" -#: src/commandhandler.cpp:889 +#: src/commandhandler.cpp:902 #, c-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" -#: src/commandhandler.cpp:898 +#: src/commandhandler.cpp:911 #, c-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: src/commandhandler.cpp:906 +#: src/commandhandler.cpp:919 #, c-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: src/commandhandler.cpp:914 +#: src/commandhandler.cpp:927 #, c-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: src/commandhandler.cpp:922 +#: src/commandhandler.cpp:935 #, c-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: src/commandhandler.cpp:1001 +#: src/commandhandler.cpp:1014 msgid "font cache size" msgstr "字体缓存大小" -#: src/commandhandler.cpp:1013 +#: src/commandhandler.cpp:1026 msgid "Cache size:" msgstr "" -#: src/commandhandler.cpp:1017 +#: src/commandhandler.cpp:1030 msgid "Created:" msgstr "创建于：" -#: src/commandhandler.cpp:1019 +#: src/commandhandler.cpp:1032 msgid "Deleted:" msgstr "删除：" -#: src/commandhandler.cpp:1066 src/commandhandler.cpp:1073 +#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140 msgid "Resource images:" msgstr "" -#: src/commandhandler.cpp:1068 src/commandhandler.cpp:1075 +#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142 msgid "Resource orphaned images:" msgstr "" @@ -333,19 +333,19 @@ msgstr "服务器的连接丢失。" msgid "Network Error" msgstr "网络错误" -#: src/game.cpp:1323 +#: src/game.cpp:1322 msgid "Ignoring incoming trade requests" msgstr "忽略新进的交易请求" -#: src/game.cpp:1333 +#: src/game.cpp:1332 msgid "Accepting incoming trade requests" msgstr "接受传入的交易请求" -#: src/game.cpp:1733 +#: src/game.cpp:1732 msgid "Could Not Load Map" msgstr "不能加载地图" -#: src/game.cpp:1734 +#: src/game.cpp:1733 #, c-format msgid "Error while loading %s" msgstr "加载%s时出现错误" @@ -729,12 +729,12 @@ msgstr "？？？" msgid "Chat" msgstr "聊天" -#: src/gui/chatwindow.cpp:610 +#: src/gui/chatwindow.cpp:613 #, c-format msgid "Present: %s; %d players are present." msgstr "" -#: src/gui/chatwindow.cpp:997 +#: src/gui/chatwindow.cpp:1000 #, c-format msgid "Whispering to %s: %s" msgstr "对%s密语到：%s" @@ -4289,7 +4289,7 @@ msgstr "" msgid "Imitation canceled" msgstr "" -#: src/localplayer.cpp:3873 +#: src/localplayer.cpp:3876 msgid "You see " msgstr "你看" @@ -4490,6 +4490,22 @@ msgstr "MVP球员。" msgid "MVP player: " msgstr "MVP球员：" +#: src/net/ea/chathandler.cpp:370 +msgid "All whispers ignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:374 +msgid "All whispers ignore failed." +msgstr "" + +#: src/net/ea/chathandler.cpp:385 +msgid "All whispers unignored." +msgstr "" + +#: src/net/ea/chathandler.cpp:389 +msgid "All whispers unignore failed." +msgstr "" + #: src/net/ea/gamehandler.cpp:87 #, c-format msgid "Online users: %d" @@ -5065,53 +5081,53 @@ msgstr "毒药无效..." msgid "%s wants to trade with you, do you accept?" msgstr "%s想和您进行交易，是否接受？" -#: src/net/ea/tradehandler.cpp:127 +#: src/net/ea/tradehandler.cpp:134 msgid "Trading isn't possible. Trade partner is too far away." msgstr "交易不可能进行。与交易伙伴太过太过遥远" -#: src/net/ea/tradehandler.cpp:131 +#: src/net/ea/tradehandler.cpp:138 msgid "Trading isn't possible. Character doesn't exist." msgstr "交易不可能进行。角色不存在。" -#: src/net/ea/tradehandler.cpp:135 +#: src/net/ea/tradehandler.cpp:142 msgid "Trade cancelled due to an unknown reason." msgstr "交易取消因不明原因。" -#: src/net/ea/tradehandler.cpp:141 +#: src/net/ea/tradehandler.cpp:148 #, c-format msgid "Trade: You and %s" msgstr "交易：您和%s" -#: src/net/ea/tradehandler.cpp:151 +#: src/net/ea/tradehandler.cpp:158 #, c-format msgid "Trade with %s cancelled." msgstr "与%s的交易被取消。" -#: src/net/ea/tradehandler.cpp:164 +#: src/net/ea/tradehandler.cpp:171 msgid "Unhandled trade cancel packet." msgstr "未处理的交易取消分组。" -#: src/net/ea/tradehandler.cpp:229 +#: src/net/ea/tradehandler.cpp:236 msgid "Failed adding item. Trade partner is over weighted." msgstr "添加项目失败。交易伙伴已经负重太多。" -#: src/net/ea/tradehandler.cpp:234 +#: src/net/ea/tradehandler.cpp:241 msgid "Failed adding item. Trade partner has no free slot." msgstr "添加项目失败。交易伙伴无空闲槽存放物品。" -#: src/net/ea/tradehandler.cpp:239 +#: src/net/ea/tradehandler.cpp:246 msgid "Failed adding item. You can't trade this item." msgstr "添加物品失败。您不能交易这项物品." -#: src/net/ea/tradehandler.cpp:243 +#: src/net/ea/tradehandler.cpp:250 msgid "Failed adding item for unknown reason." msgstr "添加项目失败，原因未知。" -#: src/net/ea/tradehandler.cpp:262 src/net/manaserv/tradehandler.cpp:160 +#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160 msgid "Trade canceled." msgstr "交易取消。" -#: src/net/ea/tradehandler.cpp:273 src/net/manaserv/tradehandler.cpp:167 +#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167 msgid "Trade completed." msgstr "交易完成。" @@ -5534,11 +5550,11 @@ msgstr "每秒伤害" msgid "Empty address given to Network::connect()!" msgstr "空的地址给网络：连接（）！" -#: src/net/tmwa/network.cpp:355 +#: src/net/tmwa/network.cpp:356 msgid "Unable to resolve host \"" msgstr "无法解析主机“" -#: src/net/tmwa/network.cpp:425 +#: src/net/tmwa/network.cpp:426 msgid "Connection to server terminated. " msgstr "连接到服务器终止。" diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index f1b7518c5..cac12b8ec 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -26,6 +26,7 @@ #include "actorspritemanager.h" #include "channelmanager.h" #include "channel.h" +#include "configuration.h" #include "game.h" #include "guildmanager.h" #include "localplayer.h" @@ -190,6 +191,12 @@ void CommandHandler::handleCommand(const std::string &command, ChatTab *tab) handleAddIgnoreAttack(args, tab); else if (type == "dump") handleDump(args, tab); + else if (type == "serverignoreall") + handleServerIgnoreAll(args, tab); + else if (type == "serverunignoreall") + handleServerUnIgnoreAll(args, tab); + else if (type == "dumpg") + handleDumpGraphics(args, tab); else if (tab->handleCommand(type, args)) ; else if (type == "hack") @@ -373,13 +380,19 @@ void CommandHandler::handleParty(const std::string &args, ChatTab *tab) void CommandHandler::handleMe(const std::string &args, ChatTab *tab) { + const std::string str = strprintf("*%s*", args.c_str()); + outString(tab, strprintf("*%s*", args.c_str()), args); +} + +void CommandHandler::outString(ChatTab *tab, const std::string &str, + const std::string &def) +{ if (!tab) { - Net::getChatHandler()->me(args); + Net::getChatHandler()->me(def); return; } - const std::string str = strprintf("*%s*", args.c_str()); switch (tab->getType()) { case ChatTab::TAB_PARTY: @@ -402,7 +415,7 @@ void CommandHandler::handleMe(const std::string &args, ChatTab *tab) break; } default: - Net::getChatHandler()->me(args); + Net::getChatHandler()->me(def); break; } } @@ -1020,6 +1033,60 @@ void CommandHandler::handleCacheInfo(const std::string &args A_UNUSED, #endif } +void CommandHandler::handleServerIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED) +{ + Net::getChatHandler()->ignoreAll(); +} + +void CommandHandler::handleServerUnIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED) +{ + Net::getChatHandler()->unIgnoreAll(); +} + +void CommandHandler::handleDumpGraphics(const std::string &args, ChatTab *tab) +{ + std::string str; + str = strprintf ("%s,%s,%dX%dX%d,", PACKAGE_OS, SMALL_VERSION, + mainGraphics->getWidth(), mainGraphics->getHeight(), + mainGraphics->getBpp()); + + if (mainGraphics->getFullScreen()) + str += "F"; + else + str += "W"; + if (mainGraphics->getHWAccel()) + str += "H"; + else + str += "S"; + + if (mainGraphics->getDoubleBuffer()) + str += "D"; + else + str += "_"; + +#if defined USE_OPENGL + str += strprintf(",%d", mainGraphics->getOpenGL()); +#else + str += ",0"; +#endif + + str += strprintf(",%f,", Client::getGuiAlpha()); + str += config.getBoolValue("adjustPerfomance") ? "1" : "0"; + str += config.getBoolValue("alphaCache") ? "1" : "0"; + str += config.getBoolValue("enableMapReduce") ? "1" : "0"; + str += config.getBoolValue("beingopacity") ? "1" : "0"; + str += ","; + str += config.getBoolValue("enableAlphaFix") ? "1" : "0"; + str += config.getBoolValue("disableAdvBeingCaching") ? "1" : "0"; + str += config.getBoolValue("disableBeingCaching") ? "1" : "0"; + str += config.getBoolValue("particleeffects") ? "1" : "0"; + + str += strprintf(",%d-%d", fps, config.getIntValue("fpslimit")); + outString(tab, str, str); +} + #ifdef DEBUG_DUMP_LEAKS void showRes(std::string str, ResourceManager::Resources *res); @@ -1076,6 +1143,7 @@ void CommandHandler::handleDump(const std::string &args, + toString(res->size())); } } + #elif defined ENABLE_MEM_DEBUG void CommandHandler::handleDump(const std::string &args A_UNUSED, ChatTab *tab A_UNUSED) diff --git a/src/commandhandler.h b/src/commandhandler.h index 52080dfcd..0b3146af8 100644 --- a/src/commandhandler.h +++ b/src/commandhandler.h @@ -290,8 +290,19 @@ class CommandHandler void handleAddIgnoreAttack(const std::string &args, ChatTab *tab A_UNUSED); + void handleServerIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED); + + void handleServerUnIgnoreAll(const std::string &args, + ChatTab *tab A_UNUSED); + void handleDump(const std::string &args, ChatTab *tab); + void handleDumpGraphics(const std::string &args, ChatTab *tab); + + void outString(ChatTab *tab, const std::string &str, + const std::string &def); + void handleCacheInfo(const std::string &args, ChatTab *tab A_UNUSED); bool parse2Int(const std::string &args, int *x, int *y); diff --git a/src/graphics.cpp b/src/graphics.cpp index efa1058a6..d914b0b00 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -53,6 +53,7 @@ Graphics::Graphics(): mRect.y = 0; mRect.w = 0; mRect.h = 0; + mOpenGL = 0; } Graphics::~Graphics() @@ -100,7 +101,10 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel) logger->log("Double buffer mode: %s", mDoubleBuffer ? "yes" : "no"); if (mTarget->format) + { logger->log("Bits per pixel: %d", mTarget->format->BytesPerPixel); + bpp = mTarget->format->BytesPerPixel; + } const SDL_VideoInfo *vi = SDL_GetVideoInfo(); if (!vi) diff --git a/src/graphics.h b/src/graphics.h index f3e0bd05d..4a4676b26 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -275,6 +275,21 @@ class Graphics : public gcn::SDLGraphics bool getSecure() { return mSecure; } + int getBpp() + { return mBpp; } + + bool getFullScreen() + { return mFullscreen; } + + bool getHWAccel() + { return mHWAccel; } + + bool getDoubleBuffer() + { return mDoubleBuffer; } + + int getOpenGL() + { return mOpenGL; } + int mWidth; int mHeight; @@ -290,6 +305,7 @@ class Graphics : public gcn::SDLGraphics bool mDoubleBuffer; SDL_Rect mRect; bool mSecure; + int mOpenGL; }; extern Graphics *mainGraphics; diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 59bd173bd..7969f55f8 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -294,6 +294,9 @@ void ChatWindow::fillCommands() mCommands.push_back("/removeattack "); mCommands.push_back("/addignoreattack "); mCommands.push_back("/blacklist "); + mCommands.push_back("/serverignoreall"); + mCommands.push_back("/serverunignoreall"); + mCommands.push_back("/dumpg"); } void ChatWindow::resetToDefaultSize() diff --git a/src/localplayer.cpp b/src/localplayer.cpp index f33a72bb0..58edbfd78 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -3779,8 +3779,11 @@ void LocalPlayer::fixAttackTarget() if (!mMap || !mTarget) return; - if (!getAttackType() || !config.getBoolValue("autofixPos")) + if (getMoveToTargetType() == 7 || !getAttackType() + || !config.getBoolValue("autofixPos")) + { return; + } const Vector &playerPos = getPosition(); Path debugPath = mMap->findPath( diff --git a/src/logger.h b/src/logger.h index c2fabb383..4ce89f759 100644 --- a/src/logger.h +++ b/src/logger.h @@ -29,7 +29,7 @@ class ChatWindow; #ifdef ENABLEDEBUGLOG -#define DEBUGLOG(msg) logger->dlog(msg) +#define DEBUGLOG(msg) if (logger) logger->dlog(msg) #else #define DEBUGLOG(msg) {} #endif diff --git a/src/main.h b/src/main.h index 548c3283f..63db481a5 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.1.10.16" -#define CHECK_VERSION "01.01.10.16" +#define SMALL_VERSION "1.1.10.30" +#define CHECK_VERSION "01.01.10.30" #ifdef HAVE_CONFIG_H #include "../config.h" diff --git a/src/net/chathandler.h b/src/net/chathandler.h index a0e232027..fc6c10376 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -64,6 +64,10 @@ class ChatHandler virtual void who() = 0; virtual void sendRaw(const std::string &args) = 0; + + virtual void ignoreAll() = 0; + + virtual void unIgnoreAll() = 0; }; } diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 60af645be..35e8597f0 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -353,4 +353,49 @@ void ChatHandler::processMVP(Net::MessageIn &msg) } } +void ChatHandler::processIgnoreAllResponse(Net::MessageIn &msg) +{ + int action = msg.readInt8(); + int fail = msg.readInt8(); + if (!localChatTab) + return; + + switch (action) + { + case 0: + { + switch (fail) + { + case 0: + localChatTab->chatLog(_("All whispers ignored."), + BY_SERVER); + break; + default: + localChatTab->chatLog(_("All whispers ignore failed."), + BY_SERVER); + break; + } + break; + } + case 1: + { + switch (fail) + { + case 0: + localChatTab->chatLog(_("All whispers unignored."), + BY_SERVER); + break; + default: + localChatTab->chatLog(_("All whispers unignore failed."), + BY_SERVER); + break; + } + break; + } + default: + // unknown result + break; + } +} + } // namespace Ea diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index d000b673d..cff9bf589 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -84,6 +84,8 @@ class ChatHandler : public Net::ChatHandler virtual void processMVP(Net::MessageIn &msg); + virtual void processIgnoreAllResponse(Net::MessageIn &msg); + protected: typedef std::queue<std::string> WhisperQueue; WhisperQueue mSentWhispers; diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index bdbba9715..19aa474e3 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -121,6 +121,14 @@ void TradeHandler::processTradeRequest(Net::MessageIn &msg) void TradeHandler::processTradeResponse(Net::MessageIn &msg) { + if (confirmDlg || tradePartnerName.empty() + || !player_relations.hasPermission(tradePartnerName, + PlayerRelation::TRADE)) + { + Net::getTradeHandler()->respond(false); + return; + } + switch (msg.readInt8()) { case 0: // Too far away diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h index 5eb2a0ff4..beea40423 100644 --- a/src/net/manaserv/chathandler.h +++ b/src/net/manaserv/chathandler.h @@ -133,6 +133,10 @@ class ChatHandler : public MessageHandler, public Net::ChatHandler * Handle who responses. */ void handleWhoResponse(Net::MessageIn &msg); + + void ignoreAll() + + void unIgnoreAll() }; } // namespace ManaServ diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index a8b66f5ae..f18f65a93 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -82,6 +82,34 @@ void MessageOut::writeString(const std::string &string, int length) PacketCounters::incOutBytes(length); } +void MessageOut::writeStringNoLog(const std::string &string, int length) +{ + DEBUGLOG("writeString: ***"); + int stringLength = static_cast<int>(string.length()); + if (length < 0) + { + // Write the length at the start if not fixed + writeInt16(static_cast<short>(stringLength)); + length = stringLength; + } + else if (length < stringLength) + { + // Make sure the length of the string is no longer than specified + stringLength = length; + } + expand(length); + + // Write the actual string + memcpy(mData + mPos, string.c_str(), stringLength); + + // Pad remaining space with zeros + if (length > stringLength) + memset(mData + mPos + stringLength, '\0', length - stringLength); + + mPos += length; + PacketCounters::incOutBytes(length); +} + char *MessageOut::getData() const { return mData; diff --git a/src/net/messageout.h b/src/net/messageout.h index 39a2e68bd..4445bbbe8 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -57,6 +57,13 @@ class MessageOut virtual void writeString(const std::string &string, int length = -1); /** + * Writes a string. If a fixed length is not given (-1), it is stored + * as a short at the start of the string. + */ + virtual void writeStringNoLog(const std::string &string, + int length = -1); + + /** * Returns the content of the message. */ virtual char *getData() const; diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 4e4318595..fe6592d93 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -60,6 +60,7 @@ ChatHandler::ChatHandler() SMSG_WHISPER_RESPONSE, SMSG_GM_CHAT, SMSG_MVP, // MVP + SMSG_IGNORE_ALL_RESPONSE, 0 }; handledMessages = _messages; @@ -96,6 +97,9 @@ void ChatHandler::handleMessage(Net::MessageIn &msg) processMVP(msg); break; + case SMSG_IGNORE_ALL_RESPONSE: + processIgnoreAllResponse(msg); + default: break; } @@ -249,5 +253,16 @@ void ChatHandler::processRaw(MessageOut &outMsg, std::string &line) } } -} // namespace TmwAthena +void ChatHandler::ignoreAll() +{ + MessageOut outMsg(CMSG_IGNORE_ALL); + outMsg.writeInt8(0); +} +void ChatHandler::unIgnoreAll() +{ + MessageOut outMsg(CMSG_IGNORE_ALL); + outMsg.writeInt8(1); +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index d9e927e03..197ba12b3 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -57,6 +57,10 @@ class ChatHandler : public MessageHandler, public Ea::ChatHandler void sendRaw(const std::string &args); + void ignoreAll(); + + void unIgnoreAll(); + void processRaw(MessageOut &outMsg, std::string &line); }; diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index cac8df623..bdc944d63 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -118,8 +118,8 @@ void LoginHandler::changePassword(const std::string &username A_UNUSED, const std::string &newPassword) { MessageOut outMsg(CMSG_CHAR_PASSWORD_CHANGE); - outMsg.writeString(oldPassword, 24); - outMsg.writeString(newPassword, 24); + outMsg.writeStringNoLog(oldPassword, 24); + outMsg.writeStringNoLog(newPassword, 24); } void LoginHandler::sendLoginRegister(const std::string &username, @@ -128,7 +128,7 @@ void LoginHandler::sendLoginRegister(const std::string &username, MessageOut outMsg(0x0064); outMsg.writeInt32(0); // client version outMsg.writeString(username, 24); - outMsg.writeString(password, 24); + outMsg.writeStringNoLog(password, 24); /* * eAthena calls the last byte "client version 2", but it isn't used at diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index da86f06f6..d97851d4a 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -56,6 +56,9 @@ class MessageOut : public Net::MessageOut void writeCoordinates(unsigned short x, unsigned short y, unsigned char direction); + void resetPos() + { mPos = 0; } + private: void expand(size_t size); diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 0af74c295..e26f48324 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -260,6 +260,7 @@ void Network::flush() SDL_mutexP(mMutex); ret = SDLNet_TCP_Send(mSocket, mOutBuffer, mOutSize); + DEBUGLOG("Send " + toString(mOutSize) + " bytes"); if (ret < static_cast<int>(mOutSize)) { setError("Error in SDLNet_TCP_Send(): " + @@ -427,6 +428,7 @@ void Network::receive() } else { + DEBUGLOG("Receive " + toString(ret) + " bytes"); mInSize += ret; if (mToSkip) { diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 3a753e351..caf3c8e53 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -331,5 +331,7 @@ enum #define SMSG_BEING_IP_RESPONSE 0x020c #define SMSG_PVP_MAP_MODE 0x0199 #define SMSG_PVP_SET 0x019a +#define CMSG_IGNORE_ALL 0x00d0 +#define SMSG_IGNORE_ALL_RESPONSE 0x00d2 #endif diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp index 46e482df6..1f1a0231d 100644 --- a/src/opengl1graphics.cpp +++ b/src/opengl1graphics.cpp @@ -49,6 +49,7 @@ OpenGL1Graphics::OpenGL1Graphics(): mAlpha(false), mTexture(false), mColorAlpha(false), mSync(false) { + mOpenGL = 2; } OpenGL1Graphics::~OpenGL1Graphics() diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 2ec5db490..049556c76 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -53,6 +53,7 @@ OpenGLGraphics::OpenGLGraphics(): mAlpha(false), mTexture(false), mColorAlpha(false), mSync(false) { + mOpenGL = 1; mFloatTexArray = new GLfloat[vertexBufSize * 4 + 30]; mIntTexArray = new GLint[vertexBufSize * 4 + 30]; mIntVertArray = new GLint[vertexBufSize * 4 + 30]; diff --git a/src/resources/image.h b/src/resources/image.h index 9ac2b163e..941b34465 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -188,6 +188,9 @@ class Image : public Resource static void SDLSetEnableAlphaCache(bool n) { mEnableAlphaCache = n; } + static bool SDLGetEnableAlphaCache() + { return mEnableAlphaCache; } + static void setEnableAlpha(bool n) { mEnableAlpha = n; } diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 9ff80de22..74474e067 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -636,19 +636,20 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) { case -1: { - for_each_xml_child_node(itemNode, replaceNode) + for (int f = 0; f < 9; f ++) { - if (xmlStrEqual(itemNode->name, BAD_CAST "item")) + std::map<int, int> *mapList + = itemInfo->addReplaceSprite( + parseSpriteName(removeSprite), f); + if (!mapList) + continue; + for_each_xml_child_node(itemNode, replaceNode) { - int from = XML::getProperty(itemNode, "from", 0); - int to = XML::getProperty(itemNode, "to", 1); - for (int f = 0; f < 9; f ++) + if (xmlStrEqual(itemNode->name, BAD_CAST "item")) { - std::map<int, int> *mapList - = itemInfo->addReplaceSprite( - parseSpriteName(removeSprite), f); - if (!mapList) - continue; + int from = XML::getProperty(itemNode, "from", 0); + int to = XML::getProperty(itemNode, "to", 1); + (*mapList)[from] = to; } } @@ -657,6 +658,13 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) } case -2: { + itemInfo->addReplaceSprite(parseSpriteName( + removeSprite), DIRECTION_DOWN); + itemInfo->addReplaceSprite(parseSpriteName( + removeSprite), DIRECTION_DOWNLEFT); + itemInfo->addReplaceSprite(parseSpriteName( + removeSprite), DIRECTION_DOWNRIGHT); + for_each_xml_child_node(itemNode, replaceNode) { if (xmlStrEqual(itemNode->name, BAD_CAST "item")) @@ -683,6 +691,13 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode) } case -3: { + itemInfo->addReplaceSprite(parseSpriteName( + removeSprite), DIRECTION_UP); + itemInfo->addReplaceSprite(parseSpriteName( + removeSprite), DIRECTION_UPLEFT); + itemInfo->addReplaceSprite(parseSpriteName( + removeSprite), DIRECTION_UPRIGHT); + for_each_xml_child_node(itemNode, replaceNode) { if (xmlStrEqual(itemNode->name, BAD_CAST "item")) |