summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-01 02:36:28 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-01 02:36:28 +0300
commit8321043b76660235a5ebbfbb8f43504f43c1af8b (patch)
tree83f60e26f9a243a845ed3364b60b91e0c661eb18
parentedf554290ec1cb623d163c9d87a53ee2f4245295 (diff)
downloadplus-8321043b76660235a5ebbfbb8f43504f43c1af8b.tar.gz
plus-8321043b76660235a5ebbfbb8f43504f43c1af8b.tar.bz2
plus-8321043b76660235a5ebbfbb8f43504f43c1af8b.tar.xz
plus-8321043b76660235a5ebbfbb8f43504f43c1af8b.zip
Update and rebuild translations.
-rw-r--r--data/translations/help/de.po22
-rw-r--r--data/translations/help/fr.po22
-rw-r--r--po/POTFILES.in14
-rw-r--r--po/cs.po1035
-rw-r--r--po/de.po1246
-rw-r--r--po/es.po1229
-rw-r--r--po/fi.po1230
-rw-r--r--po/fr.po1249
-rw-r--r--po/id.po1035
-rw-r--r--po/ja.po1220
-rw-r--r--po/manaplus.pot1017
-rw-r--r--po/nl_BE.po1199
-rw-r--r--po/pl.po1227
-rw-r--r--po/pt.po1353
-rw-r--r--po/pt_BR.po1354
-rw-r--r--po/ru.po1231
-rw-r--r--po/zh_CN.po1198
17 files changed, 7861 insertions, 9020 deletions
diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 0305d2bc1..cdfd8583e 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -4,9 +4,9 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-06-18 22:42+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/de/)\n"
+"PO-Revision-Date: 2012-06-23 19:58+0000\n"
+"Last-Translator: Marco Jäger <linuxcobra@gmx.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -91,7 +91,7 @@ msgid "/priceload - load shop price from disc."
msgstr "/priceload - Lade Preisliste des eigenen Geschäfts von lokaler Datei."
msgid "Search string not found."
-msgstr ""
+msgstr "Suchstring nicht gefunden."
msgid "##2s##P \"Sit\""
msgstr "##2s##P \"Hinsetzen\""
@@ -239,7 +239,7 @@ msgstr "##2RightShift + key##P \"Zum Navigationspunkt gehen\""
msgid ""
"You can do basic searching in help by using command\n"
"##2?text"
-msgstr ""
+msgstr "Sie können in der Hilfe die Grundsuche verwenden mit dem Befehl\n##2?text"
msgid "##24##P \"Item Shortcut 4\""
msgstr "##24##P \"Item Shortcut 4\""
@@ -272,7 +272,7 @@ msgid "About"
msgstr "Über"
msgid "Look this page for help and downloads:"
-msgstr ""
+msgstr "Schauen Sie diese Seite für Hilfe und Downloads:"
msgid "Other skills:"
msgstr "Andere Fähigkeiten"
@@ -339,7 +339,7 @@ msgid "Windows"
msgstr "Fenster"
msgid "Server news"
-msgstr ""
+msgstr "Server-Neuigkeiten"
msgid "##2LeftAlt + 4##P \"Emote Shortcut 4\""
msgstr "##2LeftAlt + 4##P \"Emote Tastaturkürzel 4\""
@@ -357,7 +357,7 @@ msgid "##2KeyPad0##P \"Change move type\""
msgstr "##2KeyPad0##P \"Änderung der Bewegungsart\""
msgid "Search results"
-msgstr ""
+msgstr "Suchergebnisse"
msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
msgstr "/pseudoaway, /pseudoaway MSG - setzt/löscht den Pseudo-Abwesenheitsmodus"
@@ -488,14 +488,14 @@ msgstr "##2i##P \"Ändert den Zähler für schnelles Fall
msgid ""
"##2ManaPlus##P is extended client based on old code from ##2Mana##P client.\n"
" Added many features, improved perfomance, stability, security and more."
-msgstr ""
+msgstr "##2ManaPlus##P ist ein erweiterter Client, basierend auf dem Code des ##2Mana##P Clients.\n Hinzugefügt wurden viele Funktionen, verbesserte Performance, Stabilität, Sicherheit und\n vieles mehr."
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large\n"
" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
-msgstr ""
+msgstr "##2ManaPlus##P ist ernsthaft bemüht, einen innovativen und freien Open\nSource MMORPG-Client zu erstellen. Mana verwendet 2D-Grafik und zielt\ndarauf ab, eine große und vielfältig interaktive Welt zu schaffen.\nEs unterliegt der GPL, so dass sichergestellt ist, das dieses Spiel\nnicht wegkommen kann."
msgid "##2LeftAlt + 2##P \"Emote Shortcut 2\""
msgstr "##2LeftAlt + 2##P \"Emote Tastaturkürzel 2\""
@@ -527,7 +527,7 @@ msgid ""
msgstr "Dort finden Sie eine Liste aller Spieler, die Sie zu einer beliebigen Liste\n hinzugefügt haben, sowie mehrere Konfigurationsoptionen:"
msgid "Search error"
-msgstr ""
+msgstr "Suchfehler"
msgid ""
"/msg NICK text, /whisper NICK text, /w NICK text - send whisper message to "
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index 3f6122c5d..4992ef119 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2012-06-18 22:42+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/fr/)\n"
+"PO-Revision-Date: 2012-06-25 23:54+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -93,7 +93,7 @@ msgid "/priceload - load shop price from disc."
msgstr "/priceload - Charger la liste de prix-boutique depuis le disque."
msgid "Search string not found."
-msgstr ""
+msgstr "Chaîne de recherche non trouvée."
msgid "##2s##P \"Sit\""
msgstr "##2s##P \"S'asseoir\""
@@ -241,7 +241,7 @@ msgstr "##2Shift-Droite + key##P \"Aller au point de navigation\""
msgid ""
"You can do basic searching in help by using command\n"
"##2?text"
-msgstr ""
+msgstr "Tu peux faire une recherche simple pour de l'aide en utilisant la commande\n##2?text"
msgid "##24##P \"Item Shortcut 4\""
msgstr "##24##P \"Raccourci Objet 4\""
@@ -274,7 +274,7 @@ msgid "About"
msgstr "A propos"
msgid "Look this page for help and downloads:"
-msgstr ""
+msgstr "Consulter cette page pour de l'aide et des téléchargements :"
msgid "Other skills:"
msgstr "Autres compétences :"
@@ -341,7 +341,7 @@ msgid "Windows"
msgstr "Fenêtres"
msgid "Server news"
-msgstr ""
+msgstr "Nouvelles du serveur"
msgid "##2LeftAlt + 4##P \"Emote Shortcut 4\""
msgstr "##2Alt-Gauche + 4##P \"Raccourci Emoticône 4\""
@@ -359,7 +359,7 @@ msgid "##2KeyPad0##P \"Change move type\""
msgstr "##2KeyPad0##P \"Changer de type de mouvement\""
msgid "Search results"
-msgstr ""
+msgstr "Résultats de la recherche"
msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
msgstr "/pseudoaway, /pseudoaway MSG - active/désactive le mode pseudo away (pseudo-absent)."
@@ -490,14 +490,14 @@ msgstr "##2i##P \"Changer de compteur de jet rapide d'obj
msgid ""
"##2ManaPlus##P is extended client based on old code from ##2Mana##P client.\n"
" Added many features, improved perfomance, stability, security and more."
-msgstr ""
+msgstr "##2ManaPlus##P est un client étendu basé sur du vieux code du client ##2Mana##P.\nDe nombreuses fonctions ajoutées, des performance, une stabilité, une sécurité et bien d'autres choses ont été améliorées."
msgid ""
"##2ManaPlus##P is a serious effort to create an innovative free and open\n"
" source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large\n"
" and diverse interactive world. It is licensed under the GPL, making\n"
" sure this game can't ever run away from you."
-msgstr ""
+msgstr "##2ManaPlus##P est un sérieux travail fait dans le but de créer un client gratuire et open source pour MMORPG. ManaPlus utilise des graphismes 2D et\nvise la possibilité de créer une monde plus grand eet intéractif à la fois.\nIl est distribué sous la license GPL ce qui montre que ce client ne peut vous échapper."
msgid "##2LeftAlt + 2##P \"Emote Shortcut 2\""
msgstr "##2Alt-Gauche + 2##P \"Raccourci Emoticône 2\""
@@ -529,7 +529,7 @@ msgid ""
msgstr " Vous trouverez là une liste de tout les joueurs avec qui vous avez des relations, ainsi que\n quelques options de cofiguration:"
msgid "Search error"
-msgstr ""
+msgstr "Erreur de recherche"
msgid ""
"/msg NICK text, /whisper NICK text, /w NICK text - send whisper message to "
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 773df64e5..308605978 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,16 +95,12 @@ src/net/ea/loginhandler.cpp
src/net/ea/partyhandler.cpp
src/net/ea/playerhandler.cpp
src/net/ea/specialhandler.cpp
+src/net/eathena/adminhandler.cpp
+src/net/eathena/buysellhandler.cpp
+src/net/eathena/generalhandler.cpp
+src/net/eathena/network.cpp
+src/net/eathena/partyhandler.cpp
src/net/ea/tradehandler.cpp
-src/net/manaserv/attributes.cpp
-src/net/manaserv/beinghandler.cpp
-src/net/manaserv/charhandler.cpp
-src/net/manaserv/chathandler.cpp
-src/net/manaserv/guildhandler.cpp
-src/net/manaserv/loginhandler.cpp
-src/net/manaserv/partyhandler.cpp
-src/net/manaserv/playerhandler.cpp
-src/net/manaserv/tradehandler.cpp
src/net/tmwa/adminhandler.cpp
src/net/tmwa/buysellhandler.cpp
src/net/tmwa/generalhandler.cpp
diff --git a/po/cs.po b/po/cs.po
index 6fb6ff245..0bd549e54 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
@@ -55,113 +55,112 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Nastavení"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Výkon"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Video"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr ""
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Přihlašuji se"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Požaduji postavy"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Zaměňuji herní servery"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Chyba"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Změna hesla"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Změna emailu"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Neplatný host updatů: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Neznámý příkaz."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Nelze zaslat prázdné šeptání!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -170,105 +169,105 @@ 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:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Chybí jméno party."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Chybí jméno guildy."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Prosím zadej jméno."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Enter přepíná chat."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Zpráva zavírá chat."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Enter nyní přepíná chat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Zpráva nyní ukončuje chat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "přítel"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "přehlížený"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutrální"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Hráč je již %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Hráč byl úspěšně zařazen jako %s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Hráč nemůže být zařazen jako %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Hráč nebyl ignorován!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Hráč již není ignorován!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Hráč nemůže být odignorován!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Hráč již byl vymazán!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Hráč byl úspěšně vymazán!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Hráč nemůže být vymazán!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Doba běhu klienta: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -276,7 +275,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -284,7 +283,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -292,7 +291,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -300,7 +299,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -308,27 +307,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "velikost chache fontů"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Velikost cache:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Vytvořeno:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Odstraněno:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr ""
@@ -337,39 +336,30 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr ""
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr ""
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Snímky obrazovky ukládat jako "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Ukládání snímku obrazovky selhalo!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Spojení se serverem bylo ztraceno."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Chyba sítě"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Nelze načíst mapu"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Chyba při načítání %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -400,7 +390,8 @@ msgstr "Jméno"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Útok"
@@ -420,13 +411,13 @@ msgstr ""
msgid "Result"
msgstr "Výsledek"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Vynulovat"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Nákup"
@@ -443,7 +434,7 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr ""
@@ -451,14 +442,14 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr ""
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Ukončit"
@@ -475,25 +466,25 @@ msgid "Shop"
msgstr "Obchod"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Prodej"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -564,7 +555,7 @@ msgstr "Nová hesla nesouhlasí."
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Jméno:"
@@ -675,7 +666,7 @@ msgstr "Zadej heslo pro smazání postavy"
msgid "Enter password:"
msgstr "Zadej heslo:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -755,7 +746,7 @@ msgstr "duhová 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -785,9 +776,9 @@ msgstr "Ano"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignorovat"
@@ -951,7 +942,7 @@ msgid "Did You Know?"
msgstr "Víte že ... ?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Zavřít"
@@ -968,33 +959,33 @@ msgstr "Další >"
msgid "Auto open this window"
msgstr "Automaticky otevírat toto okno"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr ""
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr ""
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Port:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Typ serveru:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -1003,8 +994,8 @@ msgid "Equipment"
msgstr "Vybavení"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Odstranit z vybavení"
@@ -1046,26 +1037,26 @@ msgid "Filter:"
msgstr "Filtr:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Vybavit"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Použít"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Upustit..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Rozdělit"
@@ -1079,17 +1070,17 @@ msgid "Weight:"
msgstr "Hmotnost:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Uložit"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Vzít"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Upustit"
@@ -1327,24 +1318,24 @@ msgstr "stavový řádek"
msgid "Need"
msgstr "Potřebuješ"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Další"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Odeslat"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Vyprázdnit"
@@ -1416,7 +1407,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Přidat komentář"
@@ -1436,7 +1427,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Vložit do seznamu ignorovaných"
@@ -1449,7 +1440,7 @@ msgid "Players"
msgstr "Hráči"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Vykopnout z party"
@@ -1457,8 +1448,8 @@ msgstr "Vykopnout z party"
msgid "Pick up"
msgstr "Sebrat"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Vložit do chatu"
@@ -1470,8 +1461,8 @@ msgstr "Označit na mapě"
msgid "Rename"
msgstr "Přejmenovat"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Odebrat"
@@ -1527,7 +1518,7 @@ msgstr "Odejít"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Pozvat do party"
@@ -1536,170 +1527,185 @@ msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Přejmenovat značku an mapě"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Jméno: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Hráčův komentář"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Komentář: "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Přidat do transakce"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Přidat 10 do transakce"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Přidat polovinu do transakce"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Přidat vše do transakce"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Přidat vše do transakce"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Uschovat 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Uschovat polovinu"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Uschovat všechny"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Uschovat všechny"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Upustit vše"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Vzít 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Vzít polovinu"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Vzít všechny"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Vzít všechny"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Skrýt"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Zobrazit"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Resetovat žlutý pruh"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Zkopírovat do chatu"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Posunout nahoru"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Posunout dolů"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Svléct"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Být přátelé"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Přehlížet"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Vymazat"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Odignorovat"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Kompletně ignorovat"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Následovat"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "imitovat"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Koupit (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Prodat (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Zobrazit věci"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1743,58 +1749,58 @@ msgstr "Heslo musí být kratší než %d znaků."
msgid "Passwords do not match."
msgstr "Hesla se neshodují."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Zvolte server"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Použít stejnou IP pro herní sub servery"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Načíst"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Připojit"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Přidat"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Upravit"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Stahuji seznam serverů...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Čekám na odezvu serveru..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Připravuji stažení"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Chyba při získávání seznamu serverů!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "potřebuje novější verzi"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "potřebuje v%s"
@@ -2628,11 +2634,11 @@ msgstr ""
msgid "Default"
msgstr "Výchozí"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Kolize kláves detekovány."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2641,7 +2647,7 @@ msgstr ""
"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
"chovat podivně."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3093,131 +3099,162 @@ msgstr "Vztahy"
msgid "When ignoring:"
msgstr "Když ignoruji:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Mrňavý (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Malý (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Střední (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Malý (11)"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Velký (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Velký (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Větší (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
+msgstr "Obrovský (15)"
+
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
msgstr "Obrovský (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr ""
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr ""
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr ""
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr ""
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr ""
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr ""
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr ""
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr ""
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr ""
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr ""
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr ""
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr ""
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Téma"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Téma GUI"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr ""
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Hlavní font"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Tučný font"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Font částic"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Pomocný font"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Bezpečný font"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Japonský font"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Velikost písma"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Velikost písma"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Téma změněno"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Restartujte klient pro aplikováni změn."
@@ -3455,7 +3492,6 @@ msgid "Auction"
msgstr "Aukce"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Požadavek k obchodování"
@@ -4373,7 +4409,7 @@ msgstr "Změň přihlášení"
msgid "Choose World"
msgstr "vyber svět"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr ""
@@ -4395,7 +4431,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr ""
@@ -4743,7 +4779,7 @@ msgstr ""
msgid "Imitation canceled"
msgstr "Imitace zrušena."
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Vidíte "
@@ -4917,7 +4953,7 @@ msgstr "Nesprávný slot."
msgid "Incorrect race."
msgstr ""
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "informaceInfo"
@@ -4983,7 +5019,7 @@ msgstr "Hra"
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Gilda vytvořena."
@@ -5194,7 +5230,7 @@ msgstr "Nelze vybavit."
msgid "Account was not found. Please re-login."
msgstr "Účet nenalezen, prosím přihlaste se znovu."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Půvoní heslo je nesprávné."
@@ -5203,9 +5239,6 @@ msgid "New password too short."
msgstr "Nové heslo je příliš krátké."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Neznámá chyba."
@@ -5305,23 +5338,23 @@ msgstr "%s opustil vaši partu."
msgid "An unknown member tried to say: %s"
msgstr "Neznámý člen se snažil říct: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Jste mrtev."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "S lítostí vám oznamujeme, že vaše postava byla zabita v bitvě."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Nejste již více naživu."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Chladné ruce smrti se natahují po vaší duši."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Konec hry!"
@@ -5329,7 +5362,7 @@ msgstr "Konec hry!"
msgid "Insert coin to continue."
msgstr "Vložte minci pro pokračování."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5337,33 +5370,33 @@ msgstr ""
"Ne, děti. Vaše postava ve skutečnosti neumřela. Ona.. errm.. odešla na lepší "
"místo."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr "Váš plán zničit nepříteli zbraň pomocí úderů vlastním krkem selhal."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Tuším že to nešlo tak hladce."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Chcete zaevidovat váš majetek?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Žel, nezbyla po vás ani stopa..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Zničen."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Vypadá to, že vám někdo podává vaši hlavu."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5538,493 +5571,231 @@ msgstr ""
msgid "Poison had no effect..."
msgstr ""
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Síla"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Hbitost"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Obratnost"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Vitalita"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Inteligence"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr ""
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Děkuji za prodej."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Síla"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Hbitost"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Vitalita"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Inteligence"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Obratnost"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Štěstí"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr ""
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr ""
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr ""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr ""
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr ""
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr ""
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr ""
@@ -6069,3 +5840,9 @@ msgstr ""
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Neznámý předmět"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Nelze načíst mapu"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Chyba při načítání %s"
diff --git a/po/de.po b/po/de.po
index b410a7b32..4e68d97ba 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,10 +17,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
-"PO-Revision-Date: 2012-06-21 20:34+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
+"PO-Revision-Date: 2012-06-23 20:05+0000\n"
+"Last-Translator: Marco Jäger <linuxcobra@gmx.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
"de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -62,114 +62,113 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Leistung"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Video"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Themen"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Verbinde zum Server"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Anmelden"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Passwort ändern"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komm jeder Zeit wieder..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Unbekannter Befehl."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Kann keine leeren Nachrichten versenden!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -178,160 +177,160 @@ msgstr ""
"Kann keinen Tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
"oder du bist es selbst."
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Anfrage den Kanal %s betreten zu dürfen."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Name der Gruppe fehlt."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Name der Gilde fehlt."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Bitte gib einen Namen an."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Nachricht schließt den Chat."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Enter aktiviert jetzt den Chat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Nachricht schließt jetzt den Chat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "Freund"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "missachtet"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Spieler ist bereits %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Spieler erfolgreich %s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Spieler konnte nicht %s werden!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Spieler wurde nicht ignoriert!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Spieler wird nicht länger ignoriert!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "Auf die schwarze Liste gesetzt"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "Feind"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Spieler ist bereits gelöscht!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Spieler erfolgreich gelöscht!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Spieler konnte nicht gelöscht werden!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Client läuft seit: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d Woche"
msgstr[1] "%d Wochen"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d Tag"
msgstr[1] "%d Tage"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d Stunde"
msgstr[1] "%d Stunden"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d Minute"
msgstr[1] "%d Minuten"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d Sekunde"
msgstr[1] "%d Sekunden"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "Schrift-Cache Größe"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Cache-Größe:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Erstellt:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Gelöscht:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Bild-Quellen:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Quelle verwaister Bilddataien:"
@@ -341,39 +340,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Allgemein"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Bildschirmfoto gespeichert unter "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Die Verbindung zum Server wurde getrennt."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Netzwerkfehler"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Karte konnte nicht geladen werden."
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Fehler beim Laden von %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -404,7 +394,8 @@ msgstr "Name"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Angriff"
@@ -424,13 +415,13 @@ msgstr "Bewegen"
msgid "Result"
msgstr "Resultat"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Zurücksetzten"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Kaufen"
@@ -447,7 +438,7 @@ msgstr "Menge:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -455,14 +446,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Beenden"
@@ -479,25 +470,25 @@ msgid "Shop"
msgstr "Laden"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkaufen"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -568,7 +559,7 @@ msgstr "Die Passwörter stimmen nicht überein."
msgid "New Character"
msgstr "Neuer Charakter"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Name :"
@@ -679,7 +670,7 @@ msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
msgid "Enter password:"
msgstr "Gib dein Passwort ein:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -759,7 +750,7 @@ msgstr "Regenbogen 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -789,9 +780,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignorieren"
@@ -955,7 +946,7 @@ msgid "Did You Know?"
msgstr "Wusstest du schon?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Schließen"
@@ -972,33 +963,33 @@ msgstr "Vor >"
msgid "Auto open this window"
msgstr "Öffne dieses Fenster automatisch"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Bearbeite Server"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Adresse:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Port:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Server Typ:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Beschreibung:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "Bitte die Adresse und den Port eines Servers eingeben."
@@ -1007,8 +998,8 @@ msgid "Equipment"
msgstr "Ausrüstung"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Ablegen"
@@ -1050,26 +1041,26 @@ msgid "Filter:"
msgstr "Filter:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Ausrüsten"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Benutzen"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Aufteilen"
@@ -1083,17 +1074,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Wegwerfen"
@@ -1331,24 +1322,24 @@ msgstr "Status Balken"
msgid "Need"
msgstr "Muss"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Stoppe Warten"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Weiter"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Absenden"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Leeren"
@@ -1420,7 +1411,7 @@ msgid "Nuke"
msgstr "Atombombe"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Kommentar hinzufügen"
@@ -1440,7 +1431,7 @@ msgstr "Hinzufügen zur bevorzugten Angriffsliste"
msgid "Add to attack list"
msgstr "Hinzufügen zur normalen Angriffsliste"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Hinzufügen zur Ignorierenliste"
@@ -1453,7 +1444,7 @@ msgid "Players"
msgstr "Spieler"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Aus Gruppe werfen"
@@ -1461,8 +1452,8 @@ msgstr "Aus Gruppe werfen"
msgid "Pick up"
msgstr "Aufheben"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
@@ -1474,8 +1465,8 @@ msgstr "Karteneinstellung"
msgid "Rename"
msgstr "Umbenennen"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Entfernen"
@@ -1531,7 +1522,7 @@ msgstr "Verlassen"
msgid "Copy to clipboard"
msgstr "Kopiere in die Zwischenablage"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Lade zu Gruppe ein"
@@ -1540,170 +1531,185 @@ msgid "Change guild position"
msgstr "Position der Gilde ändern"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Kartenzeichen umbenennen"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Name:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Spieler Kommentar"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Kommentar:"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "10 zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Die Hälfte zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Alles zum Handeln hinzufügen"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Alles zum Handeln hinzufügen"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Alles aufbewahren"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Alles aufbewahren"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Alles fallenlassen"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Alles abholen"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Alles abholen"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Fächer des Wegwerffensters leeren"
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Verstecken"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Zeigen"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Setze gelben Balken zurück"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Kopiere zu Chat"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(normal)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Nach oben"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Nach unten"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Ausziehen"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Befreunden"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Missachten"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Schwarze Liste"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Als Feind setzen"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Löschen"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Nicht mehr Ignorieren"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignoriere komplett"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Folgen"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imitation"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Kaufen(?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Verkaufen(?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Zeige Items"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr "Von der Aufhebeliste entfernen"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr "Zur Aufhebeliste hinzufügen"
@@ -1747,58 +1753,58 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Wähle deinen Server"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Wähle einen Server ***SICHERER MODUS ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Laden"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Verbinde..."
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Hinzufügen"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Ändern"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Lade Serverliste herunter...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Warte auf den Server"
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Download wird vorbereitet"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Fehler beim Empfangen der Serverliste!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "benötigt eine neuere Version"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "benötigt v%s"
@@ -2632,11 +2638,11 @@ msgstr "Zürücksetzen aller Tastenbelegungen"
msgid "Default"
msgstr "Standard"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Wiedersprüchliche Tasteneinstellung(en) entdeckt"
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2645,7 +2651,7 @@ msgstr ""
"Konflikt zwischen \"%s\" und \"%s\" Tasten.Ändere die Tastenbelegung oder "
"das Spiel lässt sich nicht richtig steuern."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr "unbekannt"
@@ -2948,11 +2954,11 @@ msgstr "Aktiviere Kartenreduzierung (Software)"
#: src/gui/setup_perfomance.cpp:69
msgid "Enable compound sprite delay (Software)"
-msgstr ""
+msgstr "Aktivierung Verbindungs-Sprite Verzögerung (Software)"
#: src/gui/setup_perfomance.cpp:72
msgid "Enable delayed images load (OpenGL)"
-msgstr ""
+msgstr "Aktivierung verzögertem Bilderladen (OpenGL)"
#: src/gui/setup_perfomance.cpp:75
msgid "Better quality (disable for better perfomance)"
@@ -3100,131 +3106,162 @@ msgstr "Beziehungen"
msgid "When ignoring:"
msgstr "Wenn ignorierend:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Winzig"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Klein"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Mittel"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Groß"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Groß"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Sehr groß"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
+msgstr "Riesig"
+
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
msgstr "Riesig"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Chinesisch (China)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Tschechisch"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Englisch"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Finnisch"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Französisch"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Deutsch"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonesisch"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Polnisch"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japanisch"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Niederländisch (Belgisch/Flämisch)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Portugiesisch"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Portugiesisch (Brasilien)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Russisch"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Spanisch (Kastilisch)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Theme"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "GUI Theme"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Sprache"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Hauptschriftart"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Dicke Schrift"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Schrift von Spieleraktionen"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Hilfe Schriftart"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Sichere Schriftart"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Japanische Schrift"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Schriftgröße"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Schriftgröße"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Theme geändert"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
@@ -3467,7 +3504,6 @@ msgid "Auction"
msgstr "Auktion"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Erbitte einen Handel"
@@ -4394,7 +4430,7 @@ msgstr "Login ändern"
msgid "Choose World"
msgstr "Wähle Welt"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "Taste_%d"
@@ -4416,7 +4452,7 @@ msgid "JB%d"
msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "U-Taste"
@@ -4763,7 +4799,7 @@ msgstr "Imitation: "
msgid "Imitation canceled"
msgstr "Imitation abgebrochen"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Du siehst "
@@ -4940,7 +4976,7 @@ msgstr "Falscher Slot."
msgid "Incorrect race."
msgstr "Falsche Rasse."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Info"
@@ -5006,7 +5042,7 @@ msgstr "Spiel"
msgid "Request to quit denied!"
msgstr "Verlassen verweigert!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Gilde erstellt."
@@ -5224,7 +5260,7 @@ msgstr "Kann nicht Ausrüsten."
msgid "Account was not found. Please re-login."
msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Altes Passwort fehlerhaft."
@@ -5233,9 +5269,6 @@ msgid "New password too short."
msgstr "Das neue Passwort ist zu kurz."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Unbekannter Fehler."
@@ -5337,24 +5370,24 @@ msgstr "%s hat deine Gruppe verlassen."
msgid "An unknown member tried to say: %s"
msgstr "Ein unbekanntes Mitglied hat versucht zu sagen: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Ach ja: Du bist Tot."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr ""
"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampf gefallen seid."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Du bist nicht länger lebendig."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Die kalten Hände des Sensenmannes greifen nach Deiner Seele."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Game Over!"
@@ -5362,7 +5395,7 @@ msgstr "Game Over!"
msgid "Insert coin to continue."
msgstr "Wirf eine Münze ein, um weiterzuspielen."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5370,7 +5403,7 @@ msgstr ""
"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
"besserem Ort gegangen."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
@@ -5378,27 +5411,27 @@ msgstr ""
"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
"nicht ganz so genial, wie Du dachtest..."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Ich glaube, das war nicht so gut."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Vernichtet."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5576,501 +5609,235 @@ msgstr "Konnte nichts stehlen..."
msgid "Poison had no effect..."
msgstr "Gift hatte kein Effekt..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-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:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handeln nicht möglich. Handelspartner ist zu weit entfernt."
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handeln nicht möglich. Handelspartner existiert nicht."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handeln abgebrochen durch eine unbekannte Ursache."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handeln: Du und %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel mit %s abgebrochen."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Unbehandeltes Handel-Fehlschlags-Paket."
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Fehlschlag: Der Handelspartner kann nichts mehr Tragen."
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen Platz in "
-"seinem Inventar."
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr ""
-"Gegenstand hinzufügen fehlgeschlagen. Sie können diesen Gegenstand nicht "
-"handeln."
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr "Gegenstand hinzufügen aus unbekannten Gründen fehlgeschlagen."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel abgebrochen."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel abgeschlossen."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Stärke"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Stärke %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Beweglichkeit"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Beweglichkeit %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Ausdauer"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Geschicklichkeit %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Gesundheit"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Gesundheit %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Intelligenz"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligenz %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Willenskraft:"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Willenskraft %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Drücke \"OK\" um neu anzufangen."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Du bist tot."
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Nicht angemeldet."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Kein freier Slot."
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Ungültiger Name."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Benutzername bereits vorhanden."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Ungültiger Haarstil."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Ungültige Haarfarbe."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Ungültiges Geschlecht."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Spielfigurattribute sind zu groß."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Spielfigurattribute sind zu klein."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-"Einer oder mehr Attribute sind außerhalb der erlaubten Werte: (%u - %u)."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Falsche Slotnummer"
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Spieler gelöscht"
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Auswahl außer Reichweite."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Unbekannter Fehler (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Keine Server verfügbar."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Thema: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Spieler im aktuellen Kanal:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Fehler beim Betreten des Kanals."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Kanalliste"
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Ende der Kanalliste."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s ist dem Kanal beigetreten."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s hat den Kanal verlassen."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s hat %s gekickt."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Unbekannter Befehl."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Fehler beim Erstellen der Gilde."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Einladung gesendet."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Mitglied wurde erfolgreich befördert."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Beförderung des Mitglieds gescheitert."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Fehlerhaftes Magiemerkmal."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Bereits angemeldet."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Account gesperrt."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Neues Passwort fehlerhaft"
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Neue E-Mailadresse ist fehlerhaft"
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Alte E-Mailadresse ist fehlerhaft"
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "Die neue E-Mailadresse ist bereits vorhanden."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
-"kontaktieren."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Die Version des Spiels ist zu alt."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Benutzername oder Passwort falsch."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Account gesperrt."
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Benutzername, Passwort oder E-Mailadresse falsch."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Benutzername bereits vorhanden."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "E-Mailadresse bereits vorhanden."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Der Gruppe beigetreten."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s ist der Gruppe beigetreten."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s hat Deine Einladung zurückgewiesen."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Akzeptiere eingehende Handelsanfragen."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriere eingehende Handelsanfragen."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Handel mit %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Spieler aus dem Kanal geworfen!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Vielen Dank für den Verkauf."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Verkauf fehlgeschlagen."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Handel fehlgeschlagen."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Es ist nicht möglich, einen unverkäuflichen Gegenstand zu verkaufen."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Stärke %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Beweglichkeit %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Gesundheit %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligenz %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Ausdauer %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Glück %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Authentifizierung verweigert."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Keine Server verfügbar."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Jemand anderes versucht diesen Account zu benutzen."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Dieser Account ist bereits angemeldet."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Geschwindigkeitsproblem festgestellt."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Mehrfache Anmeldung."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Unbekannter Verbindungsfehler."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Verbindung zum Server unterbrochen!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Stärke"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Beweglichkeit"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Gesundheit"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Intelligenz"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Ausdauer"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Glück"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Verteidigung:"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "M.Angriff:"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "M.Verteidigung:"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Genauigkeit"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Ausweichen"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Kritisch"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Angriffsverzögerung"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Lauf-Verzögerung:"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Angriffsreichweite"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Schaden pro Sek."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Empty address given to Network::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Nicht möglich den host \" aufzulösen"
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Verbindung mit Server abgebrochen."
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s ist nicht in Deiner Gruppe!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+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:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handeln nicht möglich. Handelspartner ist zu weit entfernt."
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handeln nicht möglich. Handelspartner existiert nicht."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handeln abgebrochen durch eine unbekannte Ursache."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handeln: Du und %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel mit %s abgebrochen."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Unbehandeltes Handel-Fehlschlags-Paket."
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Fehlschlag: Der Handelspartner kann nichts mehr Tragen."
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen Platz in "
+"seinem Inventar."
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Sie können diesen Gegenstand nicht "
+"handeln."
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr "Gegenstand hinzufügen aus unbekannten Gründen fehlgeschlagen."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Handel abgebrochen."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Handel abgeschlossen."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Drucke '..'"
@@ -6115,3 +5882,198 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Karte konnte nicht geladen werden."
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Fehler beim Laden von %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Stärke %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Beweglichkeit %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Geschicklichkeit %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Gesundheit %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Intelligenz %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Willenskraft:"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Willenskraft %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Drücke \"OK\" um neu anzufangen."
+
+#~ msgid "You Died"
+#~ msgstr "Du bist tot."
+
+#~ msgid "Not logged in."
+#~ msgstr "Nicht angemeldet."
+
+#~ msgid "No empty slot."
+#~ msgstr "Kein freier Slot."
+
+#~ msgid "Invalid name."
+#~ msgstr "Ungültiger Name."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Benutzername bereits vorhanden."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Ungültiger Haarstil."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Ungültige Haarfarbe."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Ungültiges Geschlecht."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Spielfigurattribute sind zu groß."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Spielfigurattribute sind zu klein."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr ""
+#~ "Einer oder mehr Attribute sind außerhalb der erlaubten Werte: (%u - %u)."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Falsche Slotnummer"
+
+#~ msgid "Player deleted."
+#~ msgstr "Spieler gelöscht"
+
+#~ msgid "Selection out of range."
+#~ msgstr "Auswahl außer Reichweite."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Unbekannter Fehler (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Keine Server verfügbar."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Thema: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Spieler im aktuellen Kanal:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Fehler beim Betreten des Kanals."
+
+#~ msgid "Listing channels."
+#~ msgstr "Kanalliste"
+
+#~ msgid "End of channel list."
+#~ msgstr "Ende der Kanalliste."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s ist dem Kanal beigetreten."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s hat den Kanal verlassen."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s hat %s gekickt."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Unbekannter Befehl."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Fehler beim Erstellen der Gilde."
+
+#~ msgid "Invite sent."
+#~ msgstr "Einladung gesendet."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Mitglied wurde erfolgreich befördert."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Beförderung des Mitglieds gescheitert."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Fehlerhaftes Magiemerkmal."
+
+#~ msgid "Already logged in."
+#~ msgstr "Bereits angemeldet."
+
+#~ msgid "Account banned."
+#~ msgstr "Account gesperrt."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Neues Passwort fehlerhaft"
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Neue E-Mailadresse ist fehlerhaft"
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Alte E-Mailadresse ist fehlerhaft"
+
+#~ msgid "The new email address already exists."
+#~ msgstr "Die neue E-Mailadresse ist bereits vorhanden."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+#~ "kontaktieren."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Die Version des Spiels ist zu alt."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Benutzername oder Passwort falsch."
+
+#~ msgid "Account banned"
+#~ msgstr "Account gesperrt."
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Benutzername, Passwort oder E-Mailadresse falsch."
+
+#~ msgid "Username already exists."
+#~ msgstr "Benutzername bereits vorhanden."
+
+#~ msgid "Email address already exists."
+#~ msgstr "E-Mailadresse bereits vorhanden."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr ""
+#~ "Du hast für das Captcha zu lange gebraucht oder deine Eingabe war "
+#~ "inkorrekt."
+
+#~ msgid "Joined party."
+#~ msgstr "Der Gruppe beigetreten."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s ist der Gruppe beigetreten."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Akzeptiere eingehende Handelsanfragen."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Ignoriere eingehende Handelsanfragen."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Handel mit %s"
diff --git a/po/es.po b/po/es.po
index 314b4414b..97386c5a2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -58,113 +58,112 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Rendimiento"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "¡%s no existe y no puede ser creado! Saliendo."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Comando desconocido."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "¡No puedes enviar susurros vacíos!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -173,160 +172,160 @@ msgstr ""
"¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
"existe, o eres tú."
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando la entrada del canal %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Falta el nombre del grupo."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Falta el nombre del Clan."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Por favor, especifique un nombre."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Volver a alternar el chat."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Mensaje cierra la charla."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Volver ahora a cambiar de chat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "desatendido"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "¡Jugador ya es %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "¡Jugador %s exitosamente!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "¡Jugador no pudo ser %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "El jugador no estaba ignorado!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "¡El jugador ya no es ignorado!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "¡Al jugador no se le puede dejar de ignorar!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "en la lista negra"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "enemigo"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "¡Jugador ya borrado!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "¡Jugador borrado con éxito!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "¡Jugador no pudo ser borrado!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "tamaño de caché de fuente"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Tam. caché:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Creado:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Borrado:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Imágenes de recurso:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
@@ -336,39 +335,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "General"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Captura de pantalla guardada como "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "¡El guardado de la captura de pantalla ha fallado!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Se ha perdido la conexión con el servidor."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Error de Red"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "No se pudo cargar el mapa"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Error mientras cargaba %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -399,7 +389,8 @@ msgstr "Nombre"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Atacar"
@@ -419,13 +410,13 @@ msgstr "Mover"
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Restablecer"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Comprar"
@@ -442,7 +433,7 @@ msgstr "Cantidad:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -450,14 +441,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Salir"
@@ -474,25 +465,25 @@ msgid "Shop"
msgstr "Tienda"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -563,7 +554,7 @@ msgstr "Las nuevas contraseñas no concuerdan."
msgid "New Character"
msgstr "Nuevo Personaje"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nombre:"
@@ -674,7 +665,7 @@ msgstr "Ingrese la contraseña para borrar el personaje"
msgid "Enter password:"
msgstr "Ingrese contraseña:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -754,7 +745,7 @@ msgstr "arco iris 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -784,9 +775,9 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignorar"
@@ -950,7 +941,7 @@ msgid "Did You Know?"
msgstr "¿Sabías que...?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Cerrar"
@@ -967,33 +958,33 @@ msgstr "Siguiente >"
msgid "Auto open this window"
msgstr "Abrir automáticamente esta ventana"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Editar Servidor"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Dirección:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Puerto:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Descripción:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
"Por favor, por lo menos especifique el nombre y el puerto del servidor."
@@ -1003,8 +994,8 @@ msgid "Equipment"
msgstr "Equipamiento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Quitárselo"
@@ -1046,26 +1037,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Dividir"
@@ -1079,17 +1070,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Recuperar"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Tirar"
@@ -1325,24 +1316,24 @@ msgstr "barra de estado"
msgid "Need"
msgstr "Necesitas"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Dejar de esperar"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Siguiente"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Enviar"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Limpiar"
@@ -1414,7 +1405,7 @@ msgid "Nuke"
msgstr "Eliminar"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Agregar comentario"
@@ -1434,7 +1425,7 @@ msgstr "Añadir a la lista de ataque prioritaria"
msgid "Add to attack list"
msgstr "Agregar a la lista de ataque"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
@@ -1447,7 +1438,7 @@ msgid "Players"
msgstr "Jugadores"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Sacar del grupo"
@@ -1455,8 +1446,8 @@ msgstr "Sacar del grupo"
msgid "Pick up"
msgstr "Recoger"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Añadir al chat"
@@ -1468,8 +1459,8 @@ msgstr "Mapa Objeto"
msgid "Rename"
msgstr "Renombrar"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Quitar"
@@ -1525,7 +1516,7 @@ msgstr "Dejar"
msgid "Copy to clipboard"
msgstr "Copiar al portapapeles"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Invitar a grupo"
@@ -1534,170 +1525,185 @@ msgid "Change guild position"
msgstr "Cambiar posición del Clan"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Renombrar señal del mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nombre: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Agregar al intercambio"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Agregar todo al intercambio"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Almacenar todo"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Tirar todo"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Recuperar todo"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Limpiar ventana de lanzamiento"
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copiar al chat"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Bajar"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Desvestir"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Desatender"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Lista negra"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Fijar como enemigo"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Borrar"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Des-ignorar"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imitación"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Mostrar artículos"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr "Remover de lista de recogido"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr "Agregar a lista de recogido"
@@ -1741,58 +1747,58 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Escoge tu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Elige tu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Usar el mismo ip para los subservidores del juego"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Cargar"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Añadir"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Editar"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Bajando la lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Esperando al servidor..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Preparando la descarga"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "¡Error al recuperar la lista de servidores!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "requiere una versión mas nueva"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "requiere v%s"
@@ -2628,11 +2634,11 @@ msgstr "Restablecer todas las teclas"
msgid "Default"
msgstr "Por defecto"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Conflicto de teclas detectado."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2641,7 +2647,7 @@ msgstr ""
"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
"puede presentar un comportamiento raro."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr "Desconocido"
@@ -3094,131 +3100,162 @@ msgstr "Relaciones"
msgid "When ignoring:"
msgstr "Cuando se ignora a alguien:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Diminuto (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Pequeño (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Medio (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Extenso (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Extenso (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Grande (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "Enorme (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Chino (China)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Checo"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Inglés"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Finlandés"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Francés"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Alemán"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonesio"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Polaco"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japonés"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Holanda (Bélgica/Flandes)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Portugués"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Portugués (Brasileño)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Ruso"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Español (Castellano)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Tema de interfaz gráfica"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Idioma"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Fuente principal"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Fuente negrita"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Fuente de partícula"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Fuente de la ayuda"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Fuente segura"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Fuente japonesa"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Tamaño de fuente"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Tamaño de fuente"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Tema cambiado"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Reinicia el juego para que los cambios tengan efecto."
@@ -3456,7 +3493,6 @@ msgid "Auction"
msgstr "Subasta"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Propuesta de intercambio"
@@ -4380,7 +4416,7 @@ msgstr "Cambiar de Login"
msgid "Choose World"
msgstr "Escojer Mundo"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "tecla_%d"
@@ -4402,7 +4438,7 @@ msgid "JB%d"
msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "tecla u"
@@ -4749,7 +4785,7 @@ msgstr "Imitación: "
msgid "Imitation canceled"
msgstr "Imitación cancelada"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Ves "
@@ -4924,7 +4960,7 @@ msgstr "Ranura incorrecta."
msgid "Incorrect race."
msgstr "Raza incorrecta."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Información"
@@ -4990,7 +5026,7 @@ msgstr "Juego"
msgid "Request to quit denied!"
msgstr "¡Petición de salida denegada!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Clan creado."
@@ -5211,7 +5247,7 @@ msgstr "Imposible equipar."
msgid "Account was not found. Please re-login."
msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Contraseña antigua incorrecta."
@@ -5220,9 +5256,6 @@ msgid "New password too short."
msgstr "Nueva contraseña es muy corta."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Error desconocido."
@@ -5326,23 +5359,23 @@ msgstr "%s dejó tu grupo."
msgid "An unknown member tried to say: %s"
msgstr "Un miembro desconocido intentó decir: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Estás muerto."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Ya no estás tan vivo."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Las manos frías de la muerte se están apoderando de tu alma."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "¡Fin del Juego!"
@@ -5350,7 +5383,7 @@ msgstr "¡Fin del Juego!"
msgid "Insert coin to continue."
msgstr "Inserta moneda para continuar."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5358,7 +5391,7 @@ msgstr ""
"No, niños. Tu jugador no murió realmente. Sólo... eeeh... fue a un lugar "
"mejor."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
@@ -5366,27 +5399,27 @@ msgstr ""
"Parece que tu plan de romper las armas de tus enemigos golpeándolas con tu "
"garganta falló."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Creo que esto no fue muy bien."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "¿Quieres que tus posesiones sean identificadas?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Desgraciadamente, nada de ti fue encontrado..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Aniquilado."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Parece que te tiraron tu cabeza a tus manos."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
@@ -5562,498 +5595,232 @@ msgstr "No puedes robar nada..."
msgid "Poison had no effect..."
msgstr "Veneno no tuvo ningún efecto..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quiere comerciar contigo, aceptas?"
-
-#: src/net/ea/tradehandler.cpp:135
-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:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "El intercambio no es posible. El personaje no existe."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Intercambio cancelado por una razón desconocida."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Intercambio: Tú y %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Intercambio con %s cancelado."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Intercambio no soportado."
-
-#: src/net/ea/tradehandler.cpp:237
-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:242
-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:247
-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:251
-msgid "Failed adding item for unknown reason."
-msgstr "Fallo al añaadir objeto por una razón desconocida."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Intercambio Cancelado."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Intercambio Realizado."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Fuerza"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Fuerza %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Agilidad"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidad %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Destreza"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Vitalidad"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidad %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Inteligencia"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencia %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Fuerza de voluntad"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Voluntad %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Pulsa OK para reaparecer."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Has muerto"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "No estás conectado."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Sin espacios"
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Nombre no válido."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Nombre del personaje ya existe."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Estilo de cabello no válido."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Color del pelo no válido."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Género no válido."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Atributos del personaje son muy altos."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Atributos del personaje son muy bajos."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-"Al menos una de las características están fuera del rango permitido: (%u - "
-"%u)."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Número de ranura equivocado."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Personaje eliminado."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Selección fuera de rango."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Error desconocido (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "No hay servidores disponibles."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Tema: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Jugadores en este canal:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Error al entrar al canal."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Lista de canales."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Fin de la lista de canales."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s entró al canal."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s dejó el canal."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s colocó en el modo %s al usuario %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s expulsó a %s."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Evento de canal desconocido."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Error al crear el clan."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Invitación enviada."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Estado del miembro fue cambiado satisfactoriamente."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Error al cambiar estado del miembro."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "magic_token equivocado."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "El personaje ya está conectado."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Cuenta proscrita."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Nueva contraseña incorrecta."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Cuenta no conectada. Por favor, inicia sesión primero."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Correo nuevo incorrecto."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Correo antiguo incorrecto."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "El nuevo correo ya existe."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"El registro desde el cliente no está soportado. Por favor contacta con la "
-"administración del servidor."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "La versión del cliente es demasiado antigua."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Nombre de usuario o contraseña incorrectos."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Cuenta proscrita"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "Intento de conexión muy pronto tras intento previo."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Correo, nombre de usuario o contraseña incorrectos."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Usuario ya existe."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "La dirección de correo ya existe."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Unido al grupo."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s se ha unido al grupo."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s canceló tu invitación."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Aceptar propuestas de intercambio entrantes."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorar las propuestas de intercambio entrantes."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Intercambiando con %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Error al expulsar!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Expulsado satisfactoriamente!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Gracias por vender."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Imposible vender."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Incapaz de vender mientras intercambia."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Incapaz de vender artículo invendible."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Fuerza %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilidad %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalidad %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligencia %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destreza %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Suerte %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Fallo en la autenticación."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "No hay servidores disponibles."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Alguien está intentando usar tu cuenta."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Ya hay alguien conectado con esta cuenta."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Hack de velocidad detectado."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Inicio de sesión duplicado."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Error de conexión desconocido."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "¡Desconectado del servidor!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Fuerza"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Agilidad"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Vitalidad"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Inteligencia"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Suerte"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Defensa"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "Ataque M."
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "Defensa M."
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Precisión"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Evasión"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Crítico"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Retardo de Ataque"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Retardo de Marcha"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Alcance de Ataque"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Daño por segundo."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "¡Dirección vacía enviada a Network::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "No es posible determinar el host \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Conexión al servidor terminada. "
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "¡%s no está en tu grupo!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quiere comerciar contigo, aceptas?"
+
+#: src/net/ea/tradehandler.cpp:135
+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:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "El intercambio no es posible. El personaje no existe."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Intercambio cancelado por una razón desconocida."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Intercambio: Tú y %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Intercambio con %s cancelado."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Intercambio no soportado."
+
+#: src/net/ea/tradehandler.cpp:237
+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:242
+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:247
+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:251
+msgid "Failed adding item for unknown reason."
+msgstr "Fallo al añaadir objeto por una razón desconocida."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Intercambio Cancelado."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Intercambio Realizado."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Imprimir '...'"
@@ -6098,3 +5865,197 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Objeto desconocido"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "No se pudo cargar el mapa"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Error mientras cargaba %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Fuerza %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Agilidad %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Destreza %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Vitalidad %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Inteligencia %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Fuerza de voluntad"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Voluntad %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Pulsa OK para reaparecer."
+
+#~ msgid "You Died"
+#~ msgstr "Has muerto"
+
+#~ msgid "Not logged in."
+#~ msgstr "No estás conectado."
+
+#~ msgid "No empty slot."
+#~ msgstr "Sin espacios"
+
+#~ msgid "Invalid name."
+#~ msgstr "Nombre no válido."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Nombre del personaje ya existe."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Estilo de cabello no válido."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Color del pelo no válido."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Género no válido."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Atributos del personaje son muy altos."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Atributos del personaje son muy bajos."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr ""
+#~ "Al menos una de las características están fuera del rango permitido: (%u "
+#~ "- %u)."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Número de ranura equivocado."
+
+#~ msgid "Player deleted."
+#~ msgstr "Personaje eliminado."
+
+#~ msgid "Selection out of range."
+#~ msgstr "Selección fuera de rango."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Error desconocido (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "No hay servidores disponibles."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Tema: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Jugadores en este canal:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Error al entrar al canal."
+
+#~ msgid "Listing channels."
+#~ msgstr "Lista de canales."
+
+#~ msgid "End of channel list."
+#~ msgstr "Fin de la lista de canales."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s entró al canal."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s dejó el canal."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s colocó en el modo %s al usuario %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s expulsó a %s."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Evento de canal desconocido."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Error al crear el clan."
+
+#~ msgid "Invite sent."
+#~ msgstr "Invitación enviada."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Estado del miembro fue cambiado satisfactoriamente."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Error al cambiar estado del miembro."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "magic_token equivocado."
+
+#~ msgid "Already logged in."
+#~ msgstr "El personaje ya está conectado."
+
+#~ msgid "Account banned."
+#~ msgstr "Cuenta proscrita."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Nueva contraseña incorrecta."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Cuenta no conectada. Por favor, inicia sesión primero."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Correo nuevo incorrecto."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Correo antiguo incorrecto."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "El nuevo correo ya existe."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "El registro desde el cliente no está soportado. Por favor contacta con la "
+#~ "administración del servidor."
+
+#~ msgid "Client version is too old."
+#~ msgstr "La versión del cliente es demasiado antigua."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Nombre de usuario o contraseña incorrectos."
+
+#~ msgid "Account banned"
+#~ msgstr "Cuenta proscrita"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "Intento de conexión muy pronto tras intento previo."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Correo, nombre de usuario o contraseña incorrectos."
+
+#~ msgid "Username already exists."
+#~ msgstr "Usuario ya existe."
+
+#~ msgid "Email address already exists."
+#~ msgstr "La dirección de correo ya existe."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
+
+#~ msgid "Joined party."
+#~ msgstr "Unido al grupo."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s se ha unido al grupo."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s canceló tu invitación."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Aceptar propuestas de intercambio entrantes."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Ignorar las propuestas de intercambio entrantes."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Intercambiando con %s"
diff --git a/po/fi.po b/po/fi.po
index 883b80ab1..5bb00e0fc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,113 +53,112 @@ msgstr "P"
msgid "I"
msgstr "-"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Asetukset"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Tehokkuus"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Kuva"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Teemat"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Virhe"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Tuntematon komento."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Et voi lähettää tyhjiä kuiskauksia!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -168,160 +167,160 @@ msgstr ""
"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
"käytit omaa nimeäsi."
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Pyyntö liittyä kanavalle %s lähetetty."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Ryhmän nimi puuttuu."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Anna nimi."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Viesti sulkee keskustelun."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "ystävä"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "vaimennettu"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutraali"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Pelaaja on jo %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Pelaaja on nyt %s."
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Pelaajaa ei ollut jätetty huomiotta!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Pelaaja huomioidaan taas."
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "mustalistattu"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "vihollinen"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Pelaaja on jo pyyhitty!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Pelaaja pyyhitty."
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d viikon"
msgstr[1] "%d viikkoa"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d päivän"
msgstr[1] "%d päivää"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d tunnin"
msgstr[1] "%d tuntia"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuutin"
msgstr[1] "%d minuuttia"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d sekunnin"
msgstr[1] "%d sekuntia"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "kirjasinvälimuistin koko"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Välimuistin koko:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Luotu:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Poistettu:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Resurssikuvat:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
@@ -332,39 +331,30 @@ msgstr ""
"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
"\"true\", \"false\", \"1\" tai \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Yleiset"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Ruutukaappaus tallennettu nimellä "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Yhteys palvelimeen katkesi."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Verkkovirhe"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Kartan lataaminen epäonnistui"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Kohdetta %s ladattaessa tapahtui virhe."
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -395,7 +385,8 @@ msgstr "Nimi"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Hyökkää"
@@ -415,13 +406,13 @@ msgstr "Liiku"
msgid "Result"
msgstr "Tulos"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Nollaa"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Osta"
@@ -438,7 +429,7 @@ msgstr "Määrä:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -446,14 +437,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Sulje"
@@ -470,25 +461,25 @@ msgid "Shop"
msgstr "Kauppa"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Myy"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -559,7 +550,7 @@ msgstr "Uuden salasanan kopiot eivät täsmää."
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nimi:"
@@ -670,7 +661,7 @@ msgstr "Anna salasana hahmon poistamiseksi"
msgid "Enter password:"
msgstr "Salasana:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -750,7 +741,7 @@ msgstr "sateenkaari 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -780,9 +771,9 @@ msgstr "Kyllä"
msgid "No"
msgstr "Ei"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ohita"
@@ -946,7 +937,7 @@ msgid "Did You Know?"
msgstr "Tiesitkö?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Sulje"
@@ -963,33 +954,33 @@ msgstr "Seuraava >"
msgid "Auto open this window"
msgstr "Avaa tämä ikkuna automaattisesti"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr ""
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr ""
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Portti:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Palvelintyyppi:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -998,8 +989,8 @@ msgid "Equipment"
msgstr "Varusteet"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -1041,26 +1032,26 @@ msgid "Filter:"
msgstr "Suodin:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Ota käyttöön"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Käytä"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Pudota..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Jaa"
@@ -1074,17 +1065,17 @@ msgid "Weight:"
msgstr "Paino:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Varastoi"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Ota"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Pudota"
@@ -1320,24 +1311,24 @@ msgstr "tilapalkki"
msgid "Need"
msgstr "Tarvitaan"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Lakkaa odottamasta"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Seuraava"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Lähetä"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Tyhjennä"
@@ -1409,7 +1400,7 @@ msgid "Nuke"
msgstr "Pommita"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Lisää kommentti"
@@ -1429,7 +1420,7 @@ msgstr "Lisää prioriteettihyökkäyslistalle"
msgid "Add to attack list"
msgstr "Lisää hyökkäyslistaan"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
@@ -1442,7 +1433,7 @@ msgid "Players"
msgstr "Pelaajat"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Potki ryhmästä"
@@ -1450,8 +1441,8 @@ msgstr "Potki ryhmästä"
msgid "Pick up"
msgstr "Poimi"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Lisää keskusteluun"
@@ -1463,8 +1454,8 @@ msgstr "Karttaolio"
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Poista"
@@ -1520,7 +1511,7 @@ msgstr "Eroa"
msgid "Copy to clipboard"
msgstr "Kopioi leikepöydälle"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Kutsu ryhmään"
@@ -1529,170 +1520,185 @@ msgid "Change guild position"
msgstr "Muuta asemaa killassa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Muuta merkin nimeä "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nimi: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Pelaajakommentti "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Kommentti: "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Lisää kaikki kauppaan"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Varastoi kaikki"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Varastoi kaikki"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Pudota kaikki"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Ota 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Ota kaikki"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Kopioi keskusteluun"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(oletus)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Siirrä alas"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Riisu"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Ystävysty"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Vaimenna"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Musta lista"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Aseta viholliseksi"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Pyyhi"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Huomioi jälleen"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Seuraa"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Matki"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Osta (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Myy (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Näytä tavarat"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1736,58 +1742,58 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Valitse palvelimesi"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Valitse palvelimesi *** VARMUUSTILA ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Käytä samaa IP-osoitetta alipalvelimille"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Lataa"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Yhdistä"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Lisää"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Muokkaa"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Lataan palvelinluettelon...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Odotan palvelinta..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Valmistelen latausta"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Palvelinluettelon hakeminen epäonnistui!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "vaatii uudemman version"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "vaatii version %s"
@@ -2621,11 +2627,11 @@ msgstr ""
msgid "Default"
msgstr "Oletus"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2634,7 +2640,7 @@ msgstr ""
"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
"ole hyvä ja poista päällekkäisyydet. "
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3087,131 +3093,162 @@ msgstr "Suhteet"
msgid "When ignoring:"
msgstr "Kun jätät huomiotta:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Pikkiriikkinen (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Pieni (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Keskikokoinen (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Oletus"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Kookas (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Kookas (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Suuri (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "Jättimäinen (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "Jättimäinen (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Kiina (kiina)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Tsekki"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Englanti"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Suomi"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Ranska"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Saksa"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonesia"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Puola"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japani"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Hollanti (Belgia/fleemi)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Portugali"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Portugali (Brasilia)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Venäjä"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Espanja (Kastilli)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Teema"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Käyttöliittymän teema"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Kieli"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Pääkirjasin"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Lihavoitu kirjasin"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Hiukkaskirjasin"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Ohjekirjasin"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Turvallinen kirjasin"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Japanilainen kirjasin"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Kirjasimen koko"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Kirjasimen koko"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Ulkoasua muutettu"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -3447,7 +3484,6 @@ msgid "Auction"
msgstr "Huutokauppa"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Kaupantekoehdotus"
@@ -4370,7 +4406,7 @@ msgstr "Vaihda kirjautumistietoja"
msgid "Choose World"
msgstr "Valitse pelimaailma"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr ""
@@ -4392,7 +4428,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr ""
@@ -4739,7 +4775,7 @@ msgstr "Matki: "
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Näet "
@@ -4912,7 +4948,7 @@ msgstr "Väärä paikka."
msgid "Incorrect race."
msgstr "Väärä rotu."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Tietoja"
@@ -4978,7 +5014,7 @@ msgstr "Peli"
msgid "Request to quit denied!"
msgstr "Lopetuspyyntö evätty!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Kilta luotu."
@@ -5194,7 +5230,7 @@ msgstr "Käyttöönotto ei onnistunut."
msgid "Account was not found. Please re-login."
msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Vanha salsana on väärä."
@@ -5203,9 +5239,6 @@ msgid "New password too short."
msgstr "Uusi salasana on liian lyhyt."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Tuntematon virhe."
@@ -5308,23 +5341,23 @@ msgstr "%s on eronnut ryhmästä."
msgid "An unknown member tried to say: %s"
msgstr "Tuntematon jäsen yritti sanoa: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Olet kuollut."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Et ole enää erityisen elossa."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Tuonelasta käy sieluusi kylmä viima."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Se siitä!"
@@ -5332,7 +5365,7 @@ msgstr "Se siitä!"
msgid "Insert coin to continue."
msgstr "Syötä kolikko jatkaaksesi."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5340,7 +5373,7 @@ msgstr ""
"Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
"paikkaan."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
@@ -5348,27 +5381,27 @@ msgstr ""
"Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
"epäonnistui."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Ei tainnut mennä kovin lujaa."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Pim! Olet annihiloitu."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Jäi näköjään oma pää vetävän käteen."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
@@ -5541,498 +5574,232 @@ msgstr "Varastaminen ei onnistunut..."
msgid "Poison had no effect..."
msgstr "Myrkyllä ei ollut vaikutusta..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
-
-#: src/net/ea/tradehandler.cpp:135
-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:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Kauppa: sinä ja %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Kaupanteko pelaajan %s kanssa peruttu."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Käsittelemätön kaupan peruutus -paketti."
-
-#: src/net/ea/tradehandler.cpp:237
-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:242
-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:247
-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:251
-msgid "Failed adding item for unknown reason."
-msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Kaupat peruttu."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Kaupat tuli."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Voima"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Voima %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Ketteryys"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Ketteryys %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Näppäryys"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Näppäryys %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Elinvoima"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Elinvoima %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Älykkyys"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Älykkyys %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Tahdonvoima"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Tahdonvoima %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Paina OK syntyäksesi uudelleen."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Kuolit"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Et ole kirjautunut sisään."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Ei vapaata paikkaa."
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Epäkelpo nimi."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Hahmon nimi on jo käytössä."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Epäkelpo hiustyyli."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Epäkelpo hiusten väri."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Epäkelpo sukupuoli."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Hahmon arvot ovat liian korkeat."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr "Ainakin yksi arvo on sallitun alueen (%u - %u) ulkopuolella."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Paikan numero ei kelpaa."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Hahmo poistettu."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Valinta sallittujen arvojen ulkopuolella."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Tuntematon virhe (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Pelipalvelimia ei ole saatavilla."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Aihe: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Pelaajia tällä kanavalla:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Kanavalle liittyminen epäonnistui."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Kanavalistaus:"
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Kanavalistauksen loppu."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s liittyi kanavalle."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s poistui kanavalta."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s asetti tilan %s käyttäjälle %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s potkaisi käyttäjän %s ulos."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Tuntematon kanavatapahtuma."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Killan luonti epäonnistui."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Kutsu lähetetty."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Jäsen ylennettiin onnistuneesti."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Jäsenen ylennys epäonnistui."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Väärä taikalipuke (magic_token)."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu sisään."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Tili porttikiellossa."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Uusi salasana on väärä."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Uusi sähköpostiosoite ei kelpaa."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Vanha sähköpostiosoite ei kelpaa."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "Uusi sähköpostiosoite on jo käytössä."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Asiakasohjelmalla ei voi rekisteröityä tälle palvelimelle; ota yhteyttä "
-"palvelimen ylläpitoon."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Asiakasohjelman versio on liian vanha."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Väärä käyttäjätunnus tai salasana."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Tili porttikiellossa"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "Sisäänkirjautumista yritetty liian pian edellisen yrityksen jälḱeen."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Väärä käyttäjätunnus, salasana tai sähköpostiosoite."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Käyttäjätunnus on jo käytössä."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Sähköpostiosoite on jo käytössä."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-"Käytit captcha-testin käsittelyyn liian paljon aikaa tai vastauksesi oli "
-"väärin."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Liityit ryhmään."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s liittyi ryhmään."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s ei ottanut kutsuasi vastaan."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Hyväksyt tulevat kaupantekoehdotukset."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Kaupantekoa pelaajan %s kanssa"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Potkiminen epäonnistui!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Potkiminen onnistui!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Kiitos kaupoista."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Myyminen epäonnistui."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Kaupankäynnin aikana ei voi myydä kaupasta."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Myyntikelvotonta tavaraa ei voi myydä."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Voima %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Ketteryys %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Elinvoima %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Älykkyys %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Näppäryys %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Tuuri %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Tunnistus epäonnistui."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Palvelimia ei saatavilla."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Joku muu yrittää käyttää tätä tunnusta."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Tällä tunnuksella on jo kirjauduttu."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Nopeusviritelmä havaittu."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Kaksinkertainen sisäänkirjautuminen."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Tuntematon yhteysongelma."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Yhteys palvelimeen katkesi!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Voima"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Ketteryys"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Elinvoima"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Älykkyys"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Näppäryys"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Tuuri"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Puolustus"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "T.-hyökkäys"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "T.-puolustus"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Tarkkuus"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Välttö"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Täysosuma"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Hyökkäysviive"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Kävelyviive"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Hyökkäyskantama"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Vahinko sekunnissa."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Osoitetta ei löydy: \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Yhteys palvelimeen katkaistu. "
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s ei ole ryhmässäsi!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
+
+#: src/net/ea/tradehandler.cpp:135
+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:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Kauppa: sinä ja %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Kaupanteko pelaajan %s kanssa peruttu."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Käsittelemätön kaupan peruutus -paketti."
+
+#: src/net/ea/tradehandler.cpp:237
+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:242
+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:247
+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:251
+msgid "Failed adding item for unknown reason."
+msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Kaupat peruttu."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Kaupat tuli."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Tulosta '...'"
@@ -6077,3 +5844,198 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Tuntematon tavara"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Kartan lataaminen epäonnistui"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Kohdetta %s ladattaessa tapahtui virhe."
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Voima %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Ketteryys %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Näppäryys %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Elinvoima %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Älykkyys %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Tahdonvoima"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Tahdonvoima %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Paina OK syntyäksesi uudelleen."
+
+#~ msgid "You Died"
+#~ msgstr "Kuolit"
+
+#~ msgid "Not logged in."
+#~ msgstr "Et ole kirjautunut sisään."
+
+#~ msgid "No empty slot."
+#~ msgstr "Ei vapaata paikkaa."
+
+#~ msgid "Invalid name."
+#~ msgstr "Epäkelpo nimi."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Hahmon nimi on jo käytössä."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Epäkelpo hiustyyli."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Epäkelpo hiusten väri."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Epäkelpo sukupuoli."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Hahmon arvot ovat liian korkeat."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr "Ainakin yksi arvo on sallitun alueen (%u - %u) ulkopuolella."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Paikan numero ei kelpaa."
+
+#~ msgid "Player deleted."
+#~ msgstr "Hahmo poistettu."
+
+#~ msgid "Selection out of range."
+#~ msgstr "Valinta sallittujen arvojen ulkopuolella."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Tuntematon virhe (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Pelipalvelimia ei ole saatavilla."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Aihe: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Pelaajia tällä kanavalla:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Kanavalle liittyminen epäonnistui."
+
+#~ msgid "Listing channels."
+#~ msgstr "Kanavalistaus:"
+
+#~ msgid "End of channel list."
+#~ msgstr "Kanavalistauksen loppu."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s liittyi kanavalle."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s poistui kanavalta."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s asetti tilan %s käyttäjälle %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s potkaisi käyttäjän %s ulos."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Tuntematon kanavatapahtuma."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Killan luonti epäonnistui."
+
+#~ msgid "Invite sent."
+#~ msgstr "Kutsu lähetetty."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Jäsen ylennettiin onnistuneesti."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Jäsenen ylennys epäonnistui."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Väärä taikalipuke (magic_token)."
+
+#~ msgid "Already logged in."
+#~ msgstr "Tällä tunnuksella on jo kirjauduttu sisään."
+
+#~ msgid "Account banned."
+#~ msgstr "Tili porttikiellossa."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Uusi salasana on väärä."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Uusi sähköpostiosoite ei kelpaa."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Vanha sähköpostiosoite ei kelpaa."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "Uusi sähköpostiosoite on jo käytössä."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Asiakasohjelmalla ei voi rekisteröityä tälle palvelimelle; ota yhteyttä "
+#~ "palvelimen ylläpitoon."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Asiakasohjelman versio on liian vanha."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Väärä käyttäjätunnus tai salasana."
+
+#~ msgid "Account banned"
+#~ msgstr "Tili porttikiellossa"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr ""
+#~ "Sisäänkirjautumista yritetty liian pian edellisen yrityksen jälḱeen."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Väärä käyttäjätunnus, salasana tai sähköpostiosoite."
+
+#~ msgid "Username already exists."
+#~ msgstr "Käyttäjätunnus on jo käytössä."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Sähköpostiosoite on jo käytössä."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr ""
+#~ "Käytit captcha-testin käsittelyyn liian paljon aikaa tai vastauksesi oli "
+#~ "väärin."
+
+#~ msgid "Joined party."
+#~ msgstr "Liityit ryhmään."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s liittyi ryhmään."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s ei ottanut kutsuasi vastaan."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Hyväksyt tulevat kaupantekoehdotukset."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Kaupantekoa pelaajan %s kanssa"
diff --git a/po/fr.po b/po/fr.po
index b10c0f850..74398764d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,10 +15,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
-"PO-Revision-Date: 2012-06-21 20:34+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
+"PO-Revision-Date: 2012-06-25 23:56+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -60,114 +60,113 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Vidéo"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Thèmes"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Commande inconnue."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Vous ne pouvez pas envoyer de messages vides."
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -176,161 +175,161 @@ 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:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Demande de rejoindre le canal %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Le nom du groupe est manquant."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Veuillez indiquer un nom."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Le message ferme la conversation."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr ""
"La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Le message ferme maintenant la conversation."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "ami"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "écarté"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutre"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Joueur déjà %s !"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Joueur %s avec succès!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Le joueur n'a pas pu %s !"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Le joueur n'était pas ignoré !"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Le joueur n'est plus ignoré !"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "sous liste noire"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "ennemi"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Joueur déjà effacé !"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Joueur éliminé avec succès !"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "le joueur n'a pas pu être effacé !"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d secondes"
msgstr[1] "%d secondes"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "Taille du cache de polices"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Dimension du cache :"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Créé : "
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Effacé :"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Images des ressources :"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -340,40 +339,31 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Général"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Débogage"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Capture d'écran sauvegardée sous"
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "La sauvegarde de la capture d'écran a échoué !"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr ""
"La connexion au serveur a été coupée, le programme va maintenant se fermer."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Erreur Réseau"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "La carte n'a pu être chargée"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Erreur durant le chargement %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -404,7 +394,8 @@ msgstr "Nom"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Attaquer"
@@ -424,13 +415,13 @@ msgstr "Déplacement"
msgid "Result"
msgstr "Résultat"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Réinitialiser"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Acheter"
@@ -447,7 +438,7 @@ msgstr "Montant:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -455,14 +446,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Quitter"
@@ -479,25 +470,25 @@ msgid "Shop"
msgstr "Boutique"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vendre"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -568,7 +559,7 @@ msgstr "Les nouveaux mots de passe ne correspondent pas."
msgid "New Character"
msgstr "Nouveau Personnage"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nom :"
@@ -679,7 +670,7 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
msgid "Enter password:"
msgstr "Entrer le mot de passe :"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -759,7 +750,7 @@ msgstr "arc en ciel 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -789,9 +780,9 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignorer"
@@ -955,7 +946,7 @@ msgid "Did You Know?"
msgstr "Le saviez-vous ?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Fermer"
@@ -972,33 +963,33 @@ msgstr "Suivant >"
msgid "Auto open this window"
msgstr "Ouverture automatique de cette fenêtre"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Editer le Serveur"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Adresse :"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Port :"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Type de Serveur :"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Description :"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "Entrez au moins l'adresse et le port du serveur."
@@ -1007,8 +998,8 @@ msgid "Equipment"
msgstr "Équipement"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Retirer"
@@ -1050,26 +1041,26 @@ msgid "Filter:"
msgstr "Filtre :"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Équiper"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Utiliser"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Partager"
@@ -1083,17 +1074,17 @@ msgid "Weight:"
msgstr "Poids :"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Jeter"
@@ -1329,24 +1320,24 @@ msgstr "Barre de Statut"
msgid "Need"
msgstr "Restant"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Arrêter d'attendre "
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Suivant"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Soumettre"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Effacer"
@@ -1418,7 +1409,7 @@ msgid "Nuke"
msgstr "Annihiler"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Ajouter commentaire"
@@ -1438,7 +1429,7 @@ msgstr "Ajouter à la liste de priorités d'attaque"
msgid "Add to attack list"
msgstr "Ajouter à la liste d'attaque"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
@@ -1451,7 +1442,7 @@ msgid "Players"
msgstr "Joueurs"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Sortir du groupe"
@@ -1459,8 +1450,8 @@ msgstr "Sortir du groupe"
msgid "Pick up"
msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Ajouter à la conversation"
@@ -1472,8 +1463,8 @@ msgstr "Objet de carte"
msgid "Rename"
msgstr "Renommer"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Enlever"
@@ -1529,7 +1520,7 @@ msgstr "Quitter"
msgid "Copy to clipboard"
msgstr "Copier vers le presse-papier"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Inviter dans le groupe"
@@ -1538,170 +1529,185 @@ msgid "Change guild position"
msgstr "Changer de position dans la guilde"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Renommer le panneau de carte"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nom : "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Ajouter tout dans l'échange"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Entreposer tout"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Jeter tout"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Reprendre tout"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Vider la fenêtre de dépot"
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copier dans la conversation"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Aller vers le bas"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Déshabiller"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Être ami"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Éviter"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Liste noire"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Définir comme ennemi"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Éliminer"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Ne plus ignorer"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorer complètement"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Suivre"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imiter"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Acheter (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Vendre (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Montrer les objets"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr "Retirer de la liste de ramassage"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr "Ajouter à la liste de ramassage"
@@ -1745,58 +1751,58 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
msgid "Passwords do not match."
msgstr "Les deux mots de passe sont différents"
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Choisissez le serveur"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Choisissez votre serveur *** Mode Sûr ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Charger"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Connexion..."
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Ajouter"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Éditer"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "En attente du serveur..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Préparation du téléchargement"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Erreur lors du téléchargement de la liste de serveurs !"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "requiert une nouvelle version"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "requiert la v%s"
@@ -2630,11 +2636,11 @@ msgstr "Réinitialiser toutes les touches"
msgid "Default"
msgstr "Par défaut"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Conflit(s) de touche détecté(s)"
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2643,7 +2649,7 @@ msgstr ""
"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
"touches ou attendez vous à un possible comportement étrange du jeu."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr "inconnu"
@@ -2947,11 +2953,11 @@ msgstr "Autoriser la réduction des cartes (Logiciel)"
#: src/gui/setup_perfomance.cpp:69
msgid "Enable compound sprite delay (Software)"
-msgstr ""
+msgstr "Activer le délai des sprites composés (Logiciel)"
#: src/gui/setup_perfomance.cpp:72
msgid "Enable delayed images load (OpenGL)"
-msgstr ""
+msgstr "Activer le chargement retardé des images (OpenGL)"
#: src/gui/setup_perfomance.cpp:75
msgid "Better quality (disable for better perfomance)"
@@ -3098,131 +3104,162 @@ msgstr "Relations"
msgid "When ignoring:"
msgstr "Quand vous ignorez :"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Minuscule (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Petite (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Moyenne (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Grande (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Grande (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Grand (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
+msgstr "Immense (15)"
+
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
msgstr "Immense (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Chinois (Chine)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Tchèque"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Anglais"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Finnois"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Français"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Allemand"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonésien"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Polonais"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japonais"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Néerlandais (Belgique / Flamand)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Portugais"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Portugais (Brésilien)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Russe"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Espagnol (Castillan)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Thème"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Thème de l'interface"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Langue"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Police principale"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Police grasse"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Taille des effets de particules"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Police de l'aide"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Police sécurisée"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Police japonaise"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Taille de police"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Taille de police"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Thème changé"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Redémarrez le jeu pour que les changements soient appliqués."
@@ -3465,7 +3502,6 @@ msgid "Auction"
msgstr "Enchère"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Demande d'échange"
@@ -4397,7 +4433,7 @@ msgstr "Changer de Compte"
msgid "Choose World"
msgstr "Choix du monde"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "touche_%d"
@@ -4419,7 +4455,7 @@ msgid "JB%d"
msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "touche u"
@@ -4766,7 +4802,7 @@ msgstr "Imitation: "
msgid "Imitation canceled"
msgstr "Imitation annulée"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Vous voyez "
@@ -4948,7 +4984,7 @@ msgstr "Case incorrecte."
msgid "Incorrect race."
msgstr "Race incorrecte."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Informations"
@@ -5014,7 +5050,7 @@ msgstr "Jeu"
msgid "Request to quit denied!"
msgstr "Requête de départ refusée !"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Guilde créée."
@@ -5234,7 +5270,7 @@ msgstr "Impossible d'équiper cet objet."
msgid "Account was not found. Please re-login."
msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Ancien mot de passe incorrect."
@@ -5243,9 +5279,6 @@ msgid "New password too short."
msgstr "Le nouveau mot de passe est trop court."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Erreur inconnue."
@@ -5349,25 +5382,25 @@ msgstr "%s a quitté le groupe."
msgid "An unknown member tried to say: %s"
msgstr "Un membre inconnu a essayé de dire : %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Vous êtes mort."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr ""
"Nous avons le regret de vous informer que votre personnage est mort sur le "
"champ de bataille."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Vous n'êtes plus vraiment en vie."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Les mains gelées de la faucheuse viennent réclamer ton âme."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Fin de la partie !"
@@ -5375,7 +5408,7 @@ msgstr "Fin de la partie !"
msgid "Insert coin to continue."
msgstr "Introduire une pièce pour continuer"
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5383,7 +5416,7 @@ msgstr ""
"Non, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,... "
"il... est parti dans un monde meilleur."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
@@ -5391,27 +5424,27 @@ msgstr ""
"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
"gorge a échoué."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Voulez-vous que vos biens soient identifiés ?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Vaporisé."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Il semble que l'on vous ait rendu votre tête."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5592,503 +5625,233 @@ msgstr "Vous n'avez rien pu voler..."
msgid "Poison had no effect..."
msgstr "Le poison n'a pas eu d'effet..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-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:135
-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:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Échange impossible. Ce personnage n'existe pas."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Échange annulé pour une raison inconnue."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Échange : Vous et %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Échange avec %s annulé."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Échange non pris en compte."
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Impossible de rajouter un objet. Votre partenaire est surchargé."
-
-#: src/net/ea/tradehandler.cpp:242
-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:247
-msgid "Failed adding item. You can't trade this item."
-msgstr "Impossible d'ajouter l'objet. Celui-ci n'est pas échangeable."
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr "Impossible de rajouter un objet pour une raison inconnue."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Échange annulé."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Échange finalisé."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Force"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Force %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Agilité"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Agilité %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Dextérité"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Dextérité %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Vitalité"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalité %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligence %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Volonté"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Volonté %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Cliquez OK pour revivre"
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Vous êtes mort"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Non connecté."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Pas d'emplacement vide."
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Nom invalide."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Ce personnage existe déjà."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Style de chevelure invalide."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Couleur de cheveux invalide."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Genre invalide."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Les caractéristiques du personnage sont trop hautes."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Les caractéristiques du personnage sont trop basses."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-"Au moins une des caractéristiques est en dehors des limites autorisées : (%u "
-"- %u)."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Numéro de case invalide."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Joueur effacé."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "La sélection est invalide."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Erreur inconnue (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Pas de serveur de jeu disponible."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Sujet : %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Joueurs dans ce salon:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Erreur lors de la tentative d'entrée dans le salon."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Liste des salons."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Fin de la liste du salon."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s a rejoint le salon."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s a quitté le salon"
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s a activé le mode %s sur le joueur %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s a renvoyé %s."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Événement inconnu dans le canal."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Erreur lors de la création de la guilde."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Invitation envoyée."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Ce membre a été promu avec succès."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Échec lors de la promotion du membre"
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Mauvais jeton de sécurité."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Déjà connecté."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Compte banni."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Nouveau mot de passe incorrect."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Compte non connecté. Identifiez-vous tout d'abord."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Nouvelle adresse e-mail incorrecte."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Ancienne adresse e-mail incorrecte."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "Cette adresse e-mail existe déjà pour un autre compte."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"L'enregistrement de comptes en utilisant le client n'est pas permis. "
-"Veuillez contacter l'administrateur du serveur."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "La version de votre client est trop ancienne."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Mauvais nom d'utilisateur ou mot de passe."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Compte banni"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-"La tentative de connexion a été faite trop rapidement depuis la dernière "
-"tentative."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse e-mail."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Ce nom d'utilisateur existe déjà."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Cette adresse e-mail existe déjà."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
-"incorrecte."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Groupe rejoint"
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s a rejoint le groupe."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s a refusé votre invitation."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Accepter les demandes d'échanges."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorer les demandes d'échanges."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Échange avec %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Impossible de sortir la personne !"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Sortie de la personne effectuée avec succès !"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Merci de votre vente."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Incapable de vendre."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Impossible de vendre pendant un échange en cours"
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Rendre possible la vente d'objets invendable."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Force %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilité %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalité %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligence %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Dextérité %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Volonté %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Échec de l'authentification."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Aucun serveur n'est disponible."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Ce compte est déjà connecté."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Speed hack détecté."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Authentification déjà effectuée."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Erreur de connexion inconnue."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Vous avez été déconnecté du serveur !"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Force"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Agilité"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Vitalité"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Dextérité"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Chance"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Défense"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "Attaque M."
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "Défense M."
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Précision"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Esquive"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Coup critique"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Temps de l'attaque"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Temps de déplacement"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Portée de l'attaque"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Dommage par s."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Impossible de connecter au serveur \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Connexion au serveur terminée."
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s n'est pas membre de votre groupe !"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+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:135
+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:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Échange impossible. Ce personnage n'existe pas."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Échange annulé pour une raison inconnue."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Échange : Vous et %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Échange avec %s annulé."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Échange non pris en compte."
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Impossible de rajouter un objet. Votre partenaire est surchargé."
+
+#: src/net/ea/tradehandler.cpp:242
+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:247
+msgid "Failed adding item. You can't trade this item."
+msgstr "Impossible d'ajouter l'objet. Celui-ci n'est pas échangeable."
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr "Impossible de rajouter un objet pour une raison inconnue."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Échange annulé."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Échange finalisé."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Affiche '...'"
@@ -6133,3 +5896,201 @@ msgstr "PM %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Objet inconnu"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "La carte n'a pu être chargée"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Erreur durant le chargement %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Force %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Agilité %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Dextérité %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Vitalité %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Intelligence %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Volonté"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Volonté %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Cliquez OK pour revivre"
+
+#~ msgid "You Died"
+#~ msgstr "Vous êtes mort"
+
+#~ msgid "Not logged in."
+#~ msgstr "Non connecté."
+
+#~ msgid "No empty slot."
+#~ msgstr "Pas d'emplacement vide."
+
+#~ msgid "Invalid name."
+#~ msgstr "Nom invalide."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Ce personnage existe déjà."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Style de chevelure invalide."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Couleur de cheveux invalide."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Genre invalide."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Les caractéristiques du personnage sont trop hautes."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Les caractéristiques du personnage sont trop basses."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr ""
+#~ "Au moins une des caractéristiques est en dehors des limites autorisées : "
+#~ "(%u - %u)."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Numéro de case invalide."
+
+#~ msgid "Player deleted."
+#~ msgstr "Joueur effacé."
+
+#~ msgid "Selection out of range."
+#~ msgstr "La sélection est invalide."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Erreur inconnue (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Pas de serveur de jeu disponible."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Sujet : %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Joueurs dans ce salon:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Erreur lors de la tentative d'entrée dans le salon."
+
+#~ msgid "Listing channels."
+#~ msgstr "Liste des salons."
+
+#~ msgid "End of channel list."
+#~ msgstr "Fin de la liste du salon."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s a rejoint le salon."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s a quitté le salon"
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s a activé le mode %s sur le joueur %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s a renvoyé %s."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Événement inconnu dans le canal."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Erreur lors de la création de la guilde."
+
+#~ msgid "Invite sent."
+#~ msgstr "Invitation envoyée."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Ce membre a été promu avec succès."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Échec lors de la promotion du membre"
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Mauvais jeton de sécurité."
+
+#~ msgid "Already logged in."
+#~ msgstr "Déjà connecté."
+
+#~ msgid "Account banned."
+#~ msgstr "Compte banni."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Nouveau mot de passe incorrect."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Nouvelle adresse e-mail incorrecte."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Ancienne adresse e-mail incorrecte."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "Cette adresse e-mail existe déjà pour un autre compte."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "L'enregistrement de comptes en utilisant le client n'est pas permis. "
+#~ "Veuillez contacter l'administrateur du serveur."
+
+#~ msgid "Client version is too old."
+#~ msgstr "La version de votre client est trop ancienne."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Mauvais nom d'utilisateur ou mot de passe."
+
+#~ msgid "Account banned"
+#~ msgstr "Compte banni"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr ""
+#~ "La tentative de connexion a été faite trop rapidement depuis la dernière "
+#~ "tentative."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse e-mail."
+
+#~ msgid "Username already exists."
+#~ msgstr "Ce nom d'utilisateur existe déjà."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Cette adresse e-mail existe déjà."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr ""
+#~ "Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
+#~ "incorrecte."
+
+#~ msgid "Joined party."
+#~ msgstr "Groupe rejoint"
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s a rejoint le groupe."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s a refusé votre invitation."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Accepter les demandes d'échanges."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Ignorer les demandes d'échanges."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Échange avec %s"
diff --git a/po/id.po b/po/id.po
index b92f11c2b..067ffce7c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
@@ -55,113 +55,112 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Pengaturan"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Video"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr ""
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Pergantian server"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Kesalahan"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Perintah tidak dikenal."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Tidak dapat mengirimkan pesan tanpa nama"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -170,155 +169,155 @@ msgstr ""
"Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
"atau nama anda sendiri"
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Meminta untuk masuk ke channel %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Nama kelompok tidak dapat di temukan"
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Nama organisasi tidak ditemukan."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Tetapkan sebuah nama"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Kembalikan pengalihan obrolan"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Tutup pesan obrolan"
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Kembalikan sekarang pengalihan obrolan"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Pesan menutup obrolan"
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "Teman"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "Diabaikan"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "netral"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Pemain telah %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Pemain telah berhasil %s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Pemain tidak bisa %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Pemain tidak diabaikan!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Pemain tidak lagi diabaikan!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Pemain tidak dapat diabaikan"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Pemain telah terhapus"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Pemain telah berhasil dihapus"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Pemain tidak dapat dihapus"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "Ukuran jenis huruf cache"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Ukuran Cache:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Buat"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Hapus"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Sumber gambar"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr ""
@@ -328,39 +327,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Umum"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Screenshot disimpan sebagai"
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Gagal menyimpan screenshot!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Koneksi ke server terputus"
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Kesalahan jaringan"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Tidak dapat menampilkan peta"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Error ketika menunggu %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -391,7 +381,8 @@ msgstr "Nama"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Pukul"
@@ -411,13 +402,13 @@ msgstr "Jalan"
msgid "Result"
msgstr "Hasil"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Beli"
@@ -434,7 +425,7 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -442,14 +433,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Keluar"
@@ -466,25 +457,25 @@ msgid "Shop"
msgstr "Toko"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Jual"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -555,7 +546,7 @@ msgstr "Password baru yang dimasukkan tidak cocok."
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nama:"
@@ -666,7 +657,7 @@ msgstr "Masukan Sandi untuk menghapus karakter"
msgid "Enter password:"
msgstr "Masukkan sandi"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -746,7 +737,7 @@ msgstr "pelangi 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -776,9 +767,9 @@ msgstr "Ya"
msgid "No"
msgstr "Tidak"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Abaikan"
@@ -942,7 +933,7 @@ msgid "Did You Know?"
msgstr "Apakah kamu tahu?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Tutup"
@@ -959,33 +950,33 @@ msgstr "Selanjutnya"
msgid "Auto open this window"
msgstr "Buka jendela otomatis"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr ""
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr ""
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Port:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Tipe server:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -994,8 +985,8 @@ msgid "Equipment"
msgstr "Perlengkapan"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Lepaskan"
@@ -1037,26 +1028,26 @@ msgid "Filter:"
msgstr "Penyaring:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Pakai"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Gunakan"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Buang..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Pecah"
@@ -1070,17 +1061,17 @@ msgid "Weight:"
msgstr "Berat"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Simpan"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Kembalikan"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Buang"
@@ -1314,24 +1305,24 @@ msgstr ""
msgid "Need"
msgstr "Butuh"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Berikutnya"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Masukan"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Hapus"
@@ -1403,7 +1394,7 @@ msgid "Nuke"
msgstr "Sembunyikan"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Penambahan komentar"
@@ -1423,7 +1414,7 @@ msgstr "Tambahkan prioritas daftar menyerang"
msgid "Add to attack list"
msgstr "Tambahkan ke daftar menyerang"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Tambahkan ke daftar Abaikan"
@@ -1436,7 +1427,7 @@ msgid "Players"
msgstr "Pemain"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Keluarkan dari kelompok"
@@ -1444,8 +1435,8 @@ msgstr "Keluarkan dari kelompok"
msgid "Pick up"
msgstr "Ambil"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Ambil ke obrolan"
@@ -1457,8 +1448,8 @@ msgstr "Daftar barang"
msgid "Rename"
msgstr "Ganti nama"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Hapus"
@@ -1514,7 +1505,7 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Undang ke kelompok"
@@ -1523,170 +1514,185 @@ msgid "Change guild position"
msgstr "Ubah posisi Organisasi"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Ubah nama tanda peta"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nama:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "komentar"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Tambahkan semua ke Penukaran"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Masukkan semua"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Masukkan semua"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Buang semuanya"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Ambil semua"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Ambil semua"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Pindahkan ke chat"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(kembalikan)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Bergerak kebawah"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Tanggalkan pakaian"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Jadikan teman"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Batalkan pengabaian"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Mengikuti"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Tirukan"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Beli(?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Jual(?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Perlihatkan item"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1730,58 +1736,58 @@ msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
msgid "Passwords do not match."
msgstr "Kata sandi cocok."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Pilih Server Anda"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Pilih Servermu *** SAFE MODE ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Gunakan ip yang sama untuk sub server game"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Memuat"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Menyambung"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Tambah"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Ganti"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Mengunduh daftar server... %2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Menyambung ke server..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Menyiapkan pengunduhan"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Gagal mengunduh data server!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "Membutuhkan versi terbaru"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "Membutuhkan v%s"
@@ -2615,18 +2621,18 @@ msgstr ""
msgid "Default"
msgstr "Kembalikan"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Pertentangan kunci(kunci) terdeteksi."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3078,131 +3084,162 @@ msgstr ""
msgid "When ignoring:"
msgstr "Ketika menolak:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Sangat kecil (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Kecil (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Sedang (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Besar (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Besar (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Sangat besar (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
+msgstr "Sangat besar sekali (15)"
+
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
msgstr "Sangat besar sekali (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr ""
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr ""
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr ""
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr ""
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr ""
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr ""
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr ""
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr ""
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr ""
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr ""
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr ""
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr ""
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Tema Gui"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr ""
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Jenis huruf utama"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Jenis huruf tebal"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr ""
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Jenis huruf/Karakter yang diperbolehkan"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Ukuran huruf"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Ukuran huruf"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Tema diganti"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Restart client anda untuk memberikan efek."
@@ -3437,7 +3474,6 @@ msgid "Auction"
msgstr ""
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Meminta untuk menukar"
@@ -4355,7 +4391,7 @@ msgstr ""
msgid "Choose World"
msgstr ""
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr ""
@@ -4377,7 +4413,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr ""
@@ -4723,7 +4759,7 @@ msgstr "Tirukan:"
msgid "Imitation canceled"
msgstr "Batal menirukan"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr ""
@@ -4895,7 +4931,7 @@ msgstr ""
msgid "Incorrect race."
msgstr ""
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr ""
@@ -4961,7 +4997,7 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr ""
@@ -5172,7 +5208,7 @@ msgstr ""
msgid "Account was not found. Please re-login."
msgstr ""
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr ""
@@ -5181,9 +5217,6 @@ msgid "New password too short."
msgstr ""
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr ""
@@ -5283,23 +5316,23 @@ msgstr ""
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr ""
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr ""
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr ""
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr ""
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr ""
@@ -5307,39 +5340,39 @@ msgstr ""
msgid "Insert coin to continue."
msgstr ""
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr ""
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr ""
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr ""
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr ""
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr ""
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5512,493 +5545,231 @@ msgstr ""
msgid "Poison had no effect..."
msgstr ""
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:247
-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:251
-msgid "Failed adding item for unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr ""
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr ""
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr ""
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr ""
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr ""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr ""
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr ""
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:247
+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:251
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr ""
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr ""
@@ -6043,3 +5814,9 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr ""
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Tidak dapat menampilkan peta"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Error ketika menunggu %s"
diff --git a/po/ja.po b/po/ja.po
index a4901170b..f0d746cf6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
@@ -57,113 +57,112 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "パフォーマンス"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "ビデオ"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "テーマ"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "サーバーに接続しています"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "ログインしています"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "エラー"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "パスワード変更"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "パスワードを変更しました"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "メールアドレス変更"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "登録を解除しました"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう"
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sは存在しない為、作成できません"
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト:%s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラー"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しない為、作成できません"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "不明なコマンドです"
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "空のささやきを送信することはできません"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -172,155 +171,155 @@ msgstr ""
"%sへのささやきタブの作成に失敗しました。そのタブは既に開いている、もしくは自"
"分宛てです"
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "%sチャンネルへの参加をリクエスト中"
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "パーティ名がありません"
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "ギルド名がありません"
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "名前を入力してください"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "改行キーでチャット入力ができます"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "チャットを閉じます"
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "改行キーでチャット入力ができます"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "チャットを閉じます"
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "友達"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "無視"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "プレイヤーは既に%s"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーの%sに成功しました"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "プレイヤーを%sできなかった"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "プレイヤーを完全無視できませんでした"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "プレイヤーを完全無視解除しました"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "プレイヤーを完全無視解除できませんでした"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "ブラックリスト化されています"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "敵"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "プレイヤーは削除されています"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "プレイヤーを削除しました"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "プレイヤーを削除できませんでした"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "クライアントの稼働時間: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d週"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d日"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d時"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d分"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d秒"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "フォントキャッシュサイズ"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "キャッシュサイズ:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "作成:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "削除:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "リソースイメージ:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "リソース孤児イメージ:"
@@ -330,39 +329,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"/%sへの可能なオプションは:\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "一般"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "デバッグ"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr " としてスクリーンショットを保存しました"
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "スクリーンショットを保存できませんでした"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "サーバーへの接続が切断されました"
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "ネットワークエラー"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "マップの読み込みに失敗しました"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "%sの読み込み中にエラーが起きました"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -393,7 +383,8 @@ msgstr "名前"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "攻撃"
@@ -413,13 +404,13 @@ msgstr "動く"
msgid "Result"
msgstr "結果"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "リセット"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "買う"
@@ -436,7 +427,7 @@ msgstr "量:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -444,14 +435,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "終了"
@@ -468,25 +459,25 @@ msgid "Shop"
msgstr "店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "売る"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -557,7 +548,7 @@ msgstr "新しいパスワードが一致しません"
msgid "New Character"
msgstr "新しいキャラクター"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "名前:"
@@ -668,7 +659,7 @@ msgstr "キャラクターを削除するにはパスワードを入力して下
msgid "Enter password:"
msgstr "パスワードを入力して下さい:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -748,7 +739,7 @@ msgstr "カラフル 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -778,9 +769,9 @@ msgstr "はい"
msgid "No"
msgstr "いいえ"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "無視"
@@ -944,7 +935,7 @@ msgid "Did You Know?"
msgstr "豆知識"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "閉じる"
@@ -961,33 +952,33 @@ msgstr "次へ >"
msgid "Auto open this window"
msgstr "この窓を自動で開ける"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "サーバー編集"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "アドレス:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "ポート:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "サーバータイプ:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "詳細:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "サーバーアドレスとポートを入力して下さい"
@@ -996,8 +987,8 @@ msgid "Equipment"
msgstr "装着品"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "取外す"
@@ -1039,26 +1030,26 @@ msgid "Filter:"
msgstr "フィルタ:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "装着"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "落とす..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "分割"
@@ -1072,17 +1063,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "保管"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "取出す"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "落とす"
@@ -1316,24 +1307,24 @@ msgstr "情勢"
msgid "Need"
msgstr "必要"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "キャンセル"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "次"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "決定"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "クリア"
@@ -1405,7 +1396,7 @@ msgid "Nuke"
msgstr "消す"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "コメントをする"
@@ -1425,7 +1416,7 @@ msgstr "攻撃優先リストへ追加する"
msgid "Add to attack list"
msgstr "攻撃リストへ追加する"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "攻撃無視リストへ追加する"
@@ -1438,7 +1429,7 @@ msgid "Players"
msgstr "プレイヤー"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "パーティから一時的に追い出す"
@@ -1446,8 +1437,8 @@ msgstr "パーティから一時的に追い出す"
msgid "Pick up"
msgstr "拾う"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "チャットに追加"
@@ -1459,8 +1450,8 @@ msgstr "マップアイテム"
msgid "Rename"
msgstr "名前を変更する"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "削除"
@@ -1516,7 +1507,7 @@ msgstr "退会"
msgid "Copy to clipboard"
msgstr "クリップボードにコピー"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "パーティへ招待"
@@ -1525,170 +1516,185 @@ msgid "Change guild position"
msgstr "ギルドポジションを変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr " マップサインの名前を変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "名前: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "プレイヤーコメント "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "コメント: "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "トレードウィンドウに追加"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "トレードウィンドウに10追加する"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "トレードウィンドウに半分追加する"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "トレードウィンドウに全て追加する"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "トレードウィンドウに全て追加する"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "10 保存"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "半分保存"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "全部保存"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "全部保存"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "全て落とす"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "10 取出す"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "半分取出す"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "全部取出す"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "全部取出す"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr " 非表示"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "表示"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "黄色バーをリセットする"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "チャットへコピーする"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(デフォルト)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "上へ移動"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "下へ移動"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "脱ぐ"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "友達になる"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "無視する"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "ブラックリスト"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "敵に設定する"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "消す"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "完全無視解除"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "完全無視"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "フォロー"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "真似"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "買う (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "売る (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "アイテムを表示する"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1732,58 +1738,58 @@ msgstr "パスワードは%d文字以下でなくてはいけません"
msgid "Passwords do not match."
msgstr "パスワードが一致しません"
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "サーバーを選択してください"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "サーバーを選んで下さい *** セーフモード ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "同じIPをゲームサブサーバーでも使用する"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "読込み"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "接続"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "追加"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "編集"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "サーバーリストをダウンロード中...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "サーバーからの応答を待っています"
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "ダウンロード準備中..."
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "サーバーリストの読み込みに失敗"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "アップデートが必要です"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "v%sが必要"
@@ -2617,11 +2623,11 @@ msgstr ""
msgid "Default"
msgstr "標準に戻す"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "ショートカットキーが重複しています"
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2630,7 +2636,7 @@ msgstr ""
"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
"ん"
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3085,131 +3091,162 @@ msgstr "関係"
msgid "When ignoring:"
msgstr "完全無視の際には:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "小さい (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "小 (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "中 (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "普通"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "大1 (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "大1 (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "大2 (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "最大 (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "最大 (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "中国語 (中国)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "チェコ語"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "英語"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "フィンランド語"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "フランス語"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "ドイツ語"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "インドネシア語"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "ポーランド語"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "日本語"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "ドイツ語 (ベルギー/フランドル)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "ポルトガル語"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "ポルトガル語 (ブラジル)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "ロシア語"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "スペイン語 (カスティリヤ)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "テーマ"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "GUIテーマ"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "言語"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "メインフォント"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "太字フォント"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "パーティクルフォント"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "ヘルプフォント"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "安全なフォント"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "日本語フォント"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "フォントサイズ"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "フォントサイズ"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "テーマを変更しました"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "設定変更の為アプリケーションを再起動してください"
@@ -3444,7 +3481,6 @@ msgid "Auction"
msgstr "オークション"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "トレードをリクエスト"
@@ -4368,7 +4404,7 @@ msgstr "ログインの変更"
msgid "Choose World"
msgstr "世界の選択"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "キー_%d"
@@ -4390,7 +4426,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "u キー"
@@ -4736,7 +4772,7 @@ msgstr "真似: "
msgid "Imitation canceled"
msgstr "真似をやめる"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr " が見える"
@@ -4913,7 +4949,7 @@ msgstr "間違ったスロット"
msgid "Incorrect race."
msgstr "種別が間違っています"
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "情報"
@@ -4979,7 +5015,7 @@ msgstr "ゲーム"
msgid "Request to quit denied!"
msgstr "今キャンセルできません"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "ギルド作成成功"
@@ -5194,7 +5230,7 @@ msgstr "装着不可能"
msgid "Account was not found. Please re-login."
msgstr "アカウントが見つかりませんでした。再度ログインして下さい"
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "変更前のパスワードが間違っています"
@@ -5203,9 +5239,6 @@ msgid "New password too short."
msgstr "新しいパスワードは文字数が足りません"
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "不明なエラー"
@@ -5307,23 +5340,23 @@ msgstr "%sがパーティから退会しました"
msgid "An unknown member tried to say: %s"
msgstr "不明なメンバーからの応答: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "あなたは死にました"
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "残念なお知らせですが、あなた様のキャラは戦闘中にお亡くなりになりました"
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "既に死んでいる模様です"
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "死神の冷たい手に魂が取られてしまった"
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "ゲームオーバー"
@@ -5331,40 +5364,40 @@ msgstr "ゲームオーバー"
msgid "Insert coin to continue."
msgstr "ゲームを続けるためにはコインを入れてください"
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
"あなたのキャラは本当は死んではいません。もっと素敵なところに向かっただけ"
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr "敵の武器を潰す予定だったが…失敗した"
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "あんまり上手くいかなかったぜー"
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "遺体の持ち物を確定して欲しい?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "悲しいですがあなたの跡形さえも残っていません"
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "全滅しちゃった"
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "敵から「忘れ物」って自分の頭を渡されました"
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "またやっちゃったね。死体をドブに捨てたら新しいのもらえるかも"
@@ -5535,493 +5568,231 @@ msgstr "何も盗めませんでした"
msgid "Poison had no effect..."
msgstr "毒の影響はなかった"
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%sはあなたにトレードを申請しています"
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "相手が遠すぎる為トレードは不可能です"
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "キャラクターが存在しない為トレードは不可能です"
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "不明な理由でトレードはキャンセルされました"
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "あなたと%sとのトレード"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "%sとのトレードは中止されました"
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "できなかったトレードキャンセルパケット"
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "アイテム追加失敗。相手のインベントリーが重量オーバーです"
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "アイテム追加失敗。相手のインベントリーに空スロットがありません"
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr "アイテム追加失敗。このアイテムはトレードできません"
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr "不明な理由でアイテム追加失敗"
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "トレード中止"
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "トレード完了"
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "攻撃力"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "攻撃力 %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "機敏さ"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "機敏さ %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "命中率"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "命中率 %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "防御力"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "防御力 %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "魔力"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "魔力 %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Willpower"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Willpower %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "蘇るにはOKを押して下さい"
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "死んでしまった"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "再度ログインして下さい"
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "空スロットがありません"
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "無効な名前"
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "既に使用されているキャラクター名です"
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "髪型がダサいので失格"
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "無効の髪色"
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "キャラの性別間違ってるんじゃない?"
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "キャラクターのステータスが高すぎます"
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "キャラクターのステータスが低すぎます"
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr "1つまたは複数のスタッツが最大を超えています: (%u - %u)."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "スロットナンバーが無効です"
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "プレイヤーは削除されました"
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "ターゲットが遠すぎます"
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "不明エラー (%d)"
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "利用できるゲームサーバーがありません"
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "トピック: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "このチャンネルにいるプレイヤー:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "チャンネルに参加できませんでした"
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "チャンネルを表示しています"
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "全てのチャンネルリスト"
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%sがチャンネルに参加しました"
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%sがチャンネルから外出しました"
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%sが%sに%sしました"
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%sは%sを追い出しました"
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "不明なチャンネルイベント"
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "ギルド作成エラー"
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "招待送信成功"
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "本メンバーが無事に昇進されました"
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "メンバー昇進失敗"
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "間違ったマジックトークンです"
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "既にログインしています"
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "アカウント停止されました"
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "新しいパスワードが間違っています"
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "アカウントが接続されていません。最初にログインしてください"
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "新しいメールアドレスが間違っています"
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "変更前のメールアドレスが間違っています"
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "新しいメールアドレスは既に使用されています"
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr "クライアントからの登録はできません。サーバー管理者に連絡をして下さい"
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "アップデートが必要です"
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "ユーザーネームまたはパスワードが間違っています"
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "アカウントは追放されています"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "時間が経ってから再度ログインして下さい"
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "ユーザ名、パスワード、またはメールアドレスが間違っています"
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "既に使用されているユーザー名です"
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "既に使用されているメールアドレスです"
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "キャプチャ画像の時間切れまたは答えが間違っています"
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "パーティに参加しました"
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%sがパーティに参加しました"
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%sは招待を断りました"
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "トレードリクエストを受付中"
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "トレードリクエストを無視中"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "%sとトレードします"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "追い出し失敗"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "追い出し成功"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "ありがとうございました"
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "販売できません"
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "トレード中は売買できません"
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "トレード中は売買できません"
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "攻撃力 %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "機敏さ %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "防御力 %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "魔力 %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "命中率 %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "幸運 %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "認証に失敗しました"
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "利用できるサーバーがありません"
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "他からのログインがありました"
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "このアカウントは既にログイン中です"
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "スピードハックが探知されました"
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "重複ログイン"
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "不明な接続エラーです"
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "サーバーから切断されました"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "攻撃力"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "機敏さ"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "防御力"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "魔力"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "命中率"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "幸運"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Defense"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "M.Attack"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "M.Defense"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Accuracy"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Evade"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Critical"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "攻撃遅延"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr " 徒歩遅延"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "攻撃距離"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "ダメージ/秒"
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "ネットワークに空のアドレスが送信されました::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "ホスト名を解決できません"
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "サーバーへの接続が切断されました "
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%sはパーティのメンバーではありません"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%sはあなたにトレードを申請しています"
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "相手が遠すぎる為トレードは不可能です"
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "キャラクターが存在しない為トレードは不可能です"
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "不明な理由でトレードはキャンセルされました"
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "あなたと%sとのトレード"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "%sとのトレードは中止されました"
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "できなかったトレードキャンセルパケット"
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "アイテム追加失敗。相手のインベントリーが重量オーバーです"
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "アイテム追加失敗。相手のインベントリーに空スロットがありません"
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr "アイテム追加失敗。このアイテムはトレードできません"
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr "不明な理由でアイテム追加失敗"
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "トレード中止"
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "トレード完了"
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "'...'を表示する"
@@ -6066,3 +5837,194 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "不明なアイテム"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "マップの読み込みに失敗しました"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "%sの読み込み中にエラーが起きました"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "攻撃力 %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "機敏さ %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "命中率 %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "防御力 %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "魔力 %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Willpower"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Willpower %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "蘇るにはOKを押して下さい"
+
+#~ msgid "You Died"
+#~ msgstr "死んでしまった"
+
+#~ msgid "Not logged in."
+#~ msgstr "再度ログインして下さい"
+
+#~ msgid "No empty slot."
+#~ msgstr "空スロットがありません"
+
+#~ msgid "Invalid name."
+#~ msgstr "無効な名前"
+
+#~ msgid "Character's name already exists."
+#~ msgstr "既に使用されているキャラクター名です"
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "髪型がダサいので失格"
+
+#~ msgid "Invalid hair color."
+#~ msgstr "無効の髪色"
+
+#~ msgid "Invalid gender."
+#~ msgstr "キャラの性別間違ってるんじゃない?"
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "キャラクターのステータスが高すぎます"
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "キャラクターのステータスが低すぎます"
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr "1つまたは複数のスタッツが最大を超えています: (%u - %u)."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "スロットナンバーが無効です"
+
+#~ msgid "Player deleted."
+#~ msgstr "プレイヤーは削除されました"
+
+#~ msgid "Selection out of range."
+#~ msgstr "ターゲットが遠すぎます"
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "不明エラー (%d)"
+
+#~ msgid "No gameservers are available."
+#~ msgstr "利用できるゲームサーバーがありません"
+
+#~ msgid "Topic: %s"
+#~ msgstr "トピック: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "このチャンネルにいるプレイヤー:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "チャンネルに参加できませんでした"
+
+#~ msgid "Listing channels."
+#~ msgstr "チャンネルを表示しています"
+
+#~ msgid "End of channel list."
+#~ msgstr "全てのチャンネルリスト"
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%sがチャンネルに参加しました"
+
+#~ msgid "%s left the channel."
+#~ msgstr "%sがチャンネルから外出しました"
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%sが%sに%sしました"
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%sは%sを追い出しました"
+
+#~ msgid "Unknown channel event."
+#~ msgstr "不明なチャンネルイベント"
+
+#~ msgid "Error creating guild."
+#~ msgstr "ギルド作成エラー"
+
+#~ msgid "Invite sent."
+#~ msgstr "招待送信成功"
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "本メンバーが無事に昇進されました"
+
+#~ msgid "Failed to promote member."
+#~ msgstr "メンバー昇進失敗"
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "間違ったマジックトークンです"
+
+#~ msgid "Already logged in."
+#~ msgstr "既にログインしています"
+
+#~ msgid "Account banned."
+#~ msgstr "アカウント停止されました"
+
+#~ msgid "New password incorrect."
+#~ msgstr "新しいパスワードが間違っています"
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "アカウントが接続されていません。最初にログインしてください"
+
+#~ msgid "New email address incorrect."
+#~ msgstr "新しいメールアドレスが間違っています"
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "変更前のメールアドレスが間違っています"
+
+#~ msgid "The new email address already exists."
+#~ msgstr "新しいメールアドレスは既に使用されています"
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "クライアントからの登録はできません。サーバー管理者に連絡をして下さい"
+
+#~ msgid "Client version is too old."
+#~ msgstr "アップデートが必要です"
+
+#~ msgid "Wrong username or password."
+#~ msgstr "ユーザーネームまたはパスワードが間違っています"
+
+#~ msgid "Account banned"
+#~ msgstr "アカウントは追放されています"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "時間が経ってから再度ログインして下さい"
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "ユーザ名、パスワード、またはメールアドレスが間違っています"
+
+#~ msgid "Username already exists."
+#~ msgstr "既に使用されているユーザー名です"
+
+#~ msgid "Email address already exists."
+#~ msgstr "既に使用されているメールアドレスです"
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "キャプチャ画像の時間切れまたは答えが間違っています"
+
+#~ msgid "Joined party."
+#~ msgstr "パーティに参加しました"
+
+#~ msgid "%s joined the party."
+#~ msgstr "%sがパーティに参加しました"
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%sは招待を断りました"
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "トレードリクエストを受付中"
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "トレードリクエストを無視中"
+
+#~ msgid "Trading with %s"
+#~ msgstr "%sとトレードします"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 997c371a4..2760236d5 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: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+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"
@@ -52,273 +52,272 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr ""
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr ""
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr ""
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr ""
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr ""
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr ""
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr ""
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr ""
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr ""
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr ""
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr ""
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr ""
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr ""
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr ""
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr ""
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr ""
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr ""
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr ""
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr ""
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr ""
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr ""
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr ""
@@ -327,39 +326,30 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr ""
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr ""
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr ""
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr ""
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr ""
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr ""
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -390,7 +380,8 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr ""
@@ -410,13 +401,13 @@ msgstr ""
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr ""
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr ""
@@ -433,7 +424,7 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr ""
@@ -441,14 +432,14 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr ""
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr ""
@@ -465,25 +456,25 @@ msgid "Shop"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -554,7 +545,7 @@ msgstr ""
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr ""
@@ -665,7 +656,7 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -745,7 +736,7 @@ msgstr ""
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -775,9 +766,9 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr ""
@@ -941,7 +932,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr ""
@@ -958,33 +949,33 @@ msgstr ""
msgid "Auto open this window"
msgstr ""
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr ""
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr ""
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr ""
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr ""
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr ""
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -993,8 +984,8 @@ msgid "Equipment"
msgstr ""
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr ""
@@ -1036,26 +1027,26 @@ msgid "Filter:"
msgstr ""
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr ""
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr ""
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr ""
@@ -1069,17 +1060,17 @@ msgid "Weight:"
msgstr ""
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr ""
@@ -1315,24 +1306,24 @@ msgstr ""
msgid "Need"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr ""
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr ""
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr ""
@@ -1404,7 +1395,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr ""
@@ -1424,7 +1415,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr ""
@@ -1437,7 +1428,7 @@ msgid "Players"
msgstr ""
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr ""
@@ -1445,8 +1436,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr ""
@@ -1458,8 +1449,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr ""
@@ -1515,7 +1506,7 @@ msgstr ""
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr ""
@@ -1524,170 +1515,182 @@ msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+msgid "Add to trade all-1"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+msgid "Store all-1"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+msgid "Retrieve all-1"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1731,58 +1734,58 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr ""
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr ""
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr ""
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr ""
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr ""
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr ""
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr ""
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr ""
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr ""
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr ""
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr ""
@@ -2616,18 +2619,18 @@ msgstr ""
msgid "Default"
msgstr ""
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr ""
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3079,131 +3082,155 @@ msgstr ""
msgid "When ignoring:"
msgstr ""
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr ""
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr ""
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr ""
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+msgid "Normal (13)"
msgstr ""
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:89
+msgid "Large (14)"
msgstr ""
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:90
+msgid "Very large (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:91
+msgid "Big (16)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+msgid "Huge (18)"
msgstr ""
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+msgid "Very huge (19)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr ""
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr ""
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr ""
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr ""
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr ""
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr ""
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr ""
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr ""
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr ""
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr ""
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr ""
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr ""
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr ""
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr ""
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr ""
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr ""
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr ""
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr ""
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr ""
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+msgid "Npc font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr ""
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -3438,7 +3465,6 @@ msgid "Auction"
msgstr ""
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr ""
@@ -4356,7 +4382,7 @@ msgstr ""
msgid "Choose World"
msgstr ""
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr ""
@@ -4378,7 +4404,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr ""
@@ -4725,7 +4751,7 @@ msgstr ""
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr ""
@@ -4897,7 +4923,7 @@ msgstr ""
msgid "Incorrect race."
msgstr ""
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr ""
@@ -4963,7 +4989,7 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr ""
@@ -5174,7 +5200,7 @@ msgstr ""
msgid "Account was not found. Please re-login."
msgstr ""
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr ""
@@ -5183,9 +5209,6 @@ msgid "New password too short."
msgstr ""
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr ""
@@ -5285,23 +5308,23 @@ msgstr ""
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr ""
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr ""
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr ""
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr ""
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr ""
@@ -5309,39 +5332,39 @@ msgstr ""
msgid "Insert coin to continue."
msgstr ""
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr ""
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr ""
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr ""
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr ""
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr ""
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5512,491 +5535,229 @@ msgstr ""
msgid "Poison had no effect..."
msgstr ""
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr ""
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
msgstr ""
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
msgstr ""
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
msgstr ""
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
msgstr ""
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
msgstr ""
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/manaserv/charhandler.cpp:227
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
-msgid "Unknown error (%d)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
+msgid "Strength %+d"
msgstr ""
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
+msgid "Agility %+d"
msgstr ""
-#: src/net/manaserv/chathandler.cpp:299
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
-msgid "%s entered the channel."
+msgid "Vitality %+d"
msgstr ""
-#: src/net/manaserv/chathandler.cpp:304
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
-msgid "%s left the channel."
+msgid "Intelligence %+d"
msgstr ""
-#: src/net/manaserv/chathandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
-msgid "%s has set mode %s on user %s."
+msgid "Dexterity %+d"
msgstr ""
-#: src/net/manaserv/chathandler.cpp:331
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
-msgid "%s has kicked %s."
+msgid "Luck %+d"
msgstr ""
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
+msgid "Authentication failed."
msgstr ""
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
+msgid "No servers available."
msgstr ""
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
+msgid "This account is already logged in."
msgstr ""
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
+msgid "Speed hack detected."
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
+msgid "Duplicated login."
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
+msgid "Unknown connection error."
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
+msgid "Got disconnected from server!"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
+msgid "Luck"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
+msgid "Defense"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
+msgid "M.Attack"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
+msgid "M.Defense"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
+#, no-c-format
+msgid "% Accuracy"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
+#, no-c-format
+msgid "% Evade"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
+#, no-c-format
+msgid "% Critical"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
+msgid "Attack Delay"
msgstr ""
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
+msgid "Walk Delay"
msgstr ""
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
+msgid "Attack Range"
msgstr ""
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
+msgid "Damage per sec."
msgstr ""
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+msgid "Empty address given to Network::connect()!"
msgstr ""
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+msgid "Unable to resolve host \""
msgstr ""
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+msgid "Connection to server terminated. "
msgstr ""
-#: src/net/manaserv/tradehandler.cpp:146
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/net/tmwa/adminhandler.cpp:70
-msgid "Kick failed!"
-msgstr ""
-
-#: src/net/tmwa/adminhandler.cpp:72
-msgid "Kick succeeded!"
-msgstr ""
-
-#: src/net/tmwa/buysellhandler.cpp:133
-msgid "Thanks for selling."
-msgstr ""
-
-#: src/net/tmwa/buysellhandler.cpp:137
-msgid "Unable to sell."
-msgstr ""
-
-#: src/net/tmwa/buysellhandler.cpp:140
-msgid "Unable to sell while trading."
-msgstr ""
-
-#: src/net/tmwa/buysellhandler.cpp:143
-msgid "Unable to sell unsellable item."
+msgid "%s is not in your party!"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/ea/tradehandler.cpp:105
#, c-format
-msgid "Strength %+d"
+msgid "%s wants to trade with you, do you accept?"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:110
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:111
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/ea/tradehandler.cpp:149
#, c-format
-msgid "Dexterity %+d"
+msgid "Trade: You and %s"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/ea/tradehandler.cpp:159
#, c-format
-msgid "Luck %+d"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:139
-msgid "Authentication failed."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:142
-msgid "No servers available."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:147
-msgid "Someone else is trying to use this account."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:152
-msgid "This account is already logged in."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:156
-msgid "Speed hack detected."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:159
-msgid "Duplicated login."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:162
-msgid "Unknown connection error."
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:234
-msgid "Got disconnected from server!"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:269
-msgid "Luck"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:272
-msgid "Defense"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:273
-msgid "M.Attack"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:274
-msgid "M.Defense"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:276
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:278
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:280
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:281
-msgid "Attack Delay"
+msgid "Trade with %s cancelled."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:283
-msgid "Walk Delay"
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:285
-msgid "Attack Range"
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:287
-msgid "Damage per sec."
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-#: src/net/tmwa/network.cpp:154
-msgid "Empty address given to Network::connect()!"
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
msgstr ""
-#: src/net/tmwa/network.cpp:365
-msgid "Unable to resolve host \""
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
msgstr ""
-#: src/net/tmwa/network.cpp:435
-msgid "Connection to server terminated. "
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
msgstr ""
-#: src/net/tmwa/partyhandler.cpp:172
-#, c-format
-msgid "%s is not in your party!"
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
msgstr ""
#: src/playerrelations.cpp:482
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 3957353a0..bdafbfa9f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
@@ -54,113 +54,112 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Video"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr ""
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Onbekend commando."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -169,160 +168,160 @@ msgstr ""
"Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
"bestaat, of het is jezelf."
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Groepsnaam ontbreekt."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Guild-naam ontbreekt."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Gelieve een naam te specifiëren"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Ga terug naar chat"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Bericht sluit chat."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Ga nu terug naar chat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "vriend"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "genegeerd"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutraal"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Speler succesvol verwijderd!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weken"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dagen"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d uur"
msgstr[1] "%d uren"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuut"
msgstr[1] "%d minuten"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d seconden"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Aangemaakt:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Verwijdered:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr ""
@@ -332,39 +331,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Algemeen"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Scherafdruk opgeslagen als:"
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Kon Map Niet Laden"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Fout bij het laden van %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -395,7 +385,8 @@ msgstr "Naam"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Aanvallen"
@@ -415,13 +406,13 @@ msgstr "Beweeg"
msgid "Result"
msgstr "Resultaat"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Reset"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Kopen"
@@ -438,7 +429,7 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -446,14 +437,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Afsluiten"
@@ -470,25 +461,25 @@ msgid "Shop"
msgstr "Winkel"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkopen"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -559,7 +550,7 @@ msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Naam:"
@@ -670,7 +661,7 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen"
msgid "Enter password:"
msgstr "Geef wachtwoord:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -750,7 +741,7 @@ msgstr "regenboog 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -780,9 +771,9 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Negeer"
@@ -946,7 +937,7 @@ msgid "Did You Know?"
msgstr "Weet u?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Sluiten"
@@ -963,33 +954,33 @@ msgstr "Volgend >"
msgid "Auto open this window"
msgstr ""
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr ""
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr ""
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Poort:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Server type:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -998,8 +989,8 @@ msgid "Equipment"
msgstr "Uitrusting"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Afdoen"
@@ -1041,26 +1032,26 @@ msgid "Filter:"
msgstr "Filter:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Uitrusten"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Gebruiken"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Neerleggen..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Splitsen"
@@ -1074,17 +1065,17 @@ msgid "Weight:"
msgstr "Gewicht:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Neerleggen"
@@ -1320,24 +1311,24 @@ msgstr ""
msgid "Need"
msgstr "Nood"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Volgende"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Indienen"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Wissen"
@@ -1409,7 +1400,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr ""
@@ -1429,7 +1420,7 @@ msgstr ""
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr ""
@@ -1442,7 +1433,7 @@ msgid "Players"
msgstr "Spelers"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr ""
@@ -1450,8 +1441,8 @@ msgstr ""
msgid "Pick up"
msgstr "Raap op"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Aan chat toevoegen"
@@ -1463,8 +1454,8 @@ msgstr "Plaats voorwerp op de kaart"
msgid "Rename"
msgstr "Hernoem"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Verwijder"
@@ -1520,7 +1511,7 @@ msgstr "Verlaat"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr ""
@@ -1529,170 +1520,184 @@ msgid "Change guild position"
msgstr "Wijzig uw guild positie"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Kaart bordje hernoemen "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Naam: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+msgid "Add to trade all-1"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Plaats 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Plaats alles"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Plaats alles"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Haal alles op"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Haal alles op"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Toon"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Kopieer naar chat"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(standaard)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Beweeg naar beneden"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "ontkleed"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Word vriend"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Geen rekening mee houden"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Wis"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Volledig genegeerd"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Volg"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imiteer"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Koop (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Verkoop (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Toon Voorwerpen"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1736,58 +1741,58 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Kies Uw Server"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Kies Uw Server *** VEILIGE MODUS ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Gebruik hetzelfde ip voor spel sub-servers"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Laden"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Verbinden"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Toevoegen"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Wijzig"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Downloaden van server lijst...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Wachten op server..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Download voorbereiden"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Fout tijdens ophalen server lijst"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "vereist een nieuwere versie"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "vereist v%s"
@@ -2621,18 +2626,18 @@ msgstr ""
msgid "Default"
msgstr "Standaard"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Conflict(en) tussen toetsen gevonden."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3084,131 +3089,162 @@ msgstr "Relaties"
msgid "When ignoring:"
msgstr "Tijdens negeren:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Heel klein (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Klein (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Middelmatig (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normaal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Groot (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Groot (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Heel groot (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "Extreem groot (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "Extreem groot (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr ""
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr ""
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr ""
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr ""
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr ""
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr ""
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr ""
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr ""
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr ""
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr ""
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr ""
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr ""
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Thema"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr ""
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr ""
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Standaard Lettertype"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Vet lettertype"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Help lettertype"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr ""
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Lettergrootte"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Lettergrootte"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Thema is gewijzigd"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -3449,7 +3485,6 @@ msgid "Auction"
msgstr ""
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Handel aanvragen"
@@ -4378,7 +4413,7 @@ msgstr "Wijzig Login"
msgid "Choose World"
msgstr "Kies Wereld"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr ""
@@ -4400,7 +4435,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr ""
@@ -4747,7 +4782,7 @@ msgstr "Imitatie: "
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr ""
@@ -4921,7 +4956,7 @@ msgstr ""
msgid "Incorrect race."
msgstr ""
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Info"
@@ -4987,7 +5022,7 @@ msgstr "Spel"
msgid "Request to quit denied!"
msgstr "Aanvraag op de stoppen is geweigerd!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Guild aangemaakt."
@@ -5206,7 +5241,7 @@ msgstr "Kan dit niet uitrusten."
msgid "Account was not found. Please re-login."
msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Oud wachtwoord is ongeldig."
@@ -5215,9 +5250,6 @@ msgid "New password too short."
msgstr "Nieuw wachtwoord is te kort."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Onbekende fout."
@@ -5319,25 +5351,25 @@ msgstr "%s heeft jouw groep verlaten."
msgid "An unknown member tried to say: %s"
msgstr "Een onbekend lid probeerde te zeggen: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Je bent dood."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr ""
"We betreuren het om je te melden dat jouw personage is gestorven in een "
"gevecht."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Je bent niet langer levend."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "De koude handen van Pietje de Dood grijpen naar jouw ziel."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Game Over!"
@@ -5345,7 +5377,7 @@ msgstr "Game Over!"
msgid "Insert coin to continue."
msgstr "Werp een muntstuk in om verder te spelen."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5353,7 +5385,7 @@ msgstr ""
"Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
"naar een beter plaats gegaan."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
@@ -5361,27 +5393,27 @@ msgstr ""
"Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
"te slaan is mislukt."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Dit verliep niet zoals gepland."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Verslagen"
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Het ziet ernaar uit dat je je pijp aan Maarten mag geven."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5555,495 +5587,232 @@ msgstr "Kon niets stelen..."
msgid "Poison had no effect..."
msgstr "Gif had geen effect..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s wil met jou handelen, aanvaard je dit?"
-
-#: src/net/ea/tradehandler.cpp:135
-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:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handelen is niet mogelijk. Personage bestaat niet."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel onderbroken vanwege een onbekende reden."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handelen: Jij en %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel met %s geannuleerd."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:237
-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:242
-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:247
-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:251
-msgid "Failed adding item for unknown reason."
-msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel geannuleerd."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel voltooid."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Kracht"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Kracht %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Behendigheid"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Behendigheid %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Handigheid"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Handigheid %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Vitaliteit"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitality %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Intelligentie"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelligentie %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Wilskracht"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Wilskracht %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Klik OK om opnieuw te verschijnen."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Je bent gestorven"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Niet ingelogd"
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Ongeldige naam."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Naam van personage bestaat al."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Ongeldige haarstijl."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Ongeldige haarkleur."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Ongeldig geslacht."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Statistieken van personage zijn te hoog."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Statistieken van personage zijn te laag."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Speler verwijderd."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Onbekende fout (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Geen gameservers beschikbaar."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Onderwerp: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Spelers in dit kanaal:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Fout bij binnenkomen ruimte."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Lijst van ruimtes."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Einde van lijst van ruimtes."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s is de ruimte binnengekomen."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s verliet de ruimte."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s heeft modus %s gezet op gebruiker %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s heeft %s eruit geschopt."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Onbekend ruimte gebeurtenis."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Fout bij aanmaken guild."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Uitnodiging verzonden."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Lid is succesvol gepromoveerd."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Kon lid niet promoveren."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Verkeerd magic_token."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Je bent al ingelogd."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Nieuw wachtwoord is ongeldig."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Account niet verbonden. Log eerst in aub."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Nieuw email adres is ongeldig."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Oud email adres is ongeldig."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "Het nieuwe email adres bestaat reeds."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Client registratie is niet toegestaan. Contacteer aub de server adminstratie."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Client versie is te oud."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Verkeerde gebruikersnaam of wachtwoord."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Verkeerde gebruikersnaam, wachtwoord of email adres."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Gebruikersnaam bestaat al."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Email adres bestaat al."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Bijgevoegd bij groep."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s heeft zich bij de groep gevoegd."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s heeft uw uitnodiging geweigerd."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Inkomende handelsaanvragen accepteren."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Inkomende handelsaanvragen negeren."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Handelen met %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Kick gefaald!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Kick succesvol!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Bedankt voor het verkopen."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Kan niets verkopen."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Kan niets verkopen terwijl je aan het handelen bent."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Niet mogelijk om onverkoopbaar voorwerp te verkopen"
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Kracht %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Behandigheid %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitaliteit %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligentie %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Vaardigheid %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Geluk %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Authenticatie gefaald."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Geen servers beschikbaar."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Iemand anders is aan het proberen deze account te gebruiken."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Deze account is al ingelogd."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Snelheidshack gedetecteerd."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Verdubbelde login."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Onbekende connectiefout."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "De verbinding met de server werd verbroken!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Kracht"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Behendigheid"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Vitaliteit"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Intelligentie"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Handigheid"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Geluk"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Verdediging"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "M.Aanval"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "M.Verdediging"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Nauwkeurigheid"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Ontwijking"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Aanvalsvertraging"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Wandelvertraging"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Aanvalsbereik"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr ""
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Leeg adres gegeven aan Network::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Niet mogelijk te resolven van host \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Verbinding met server beëindigd. "
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s is niet in jouw groep!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s wil met jou handelen, aanvaard je dit?"
+
+#: src/net/ea/tradehandler.cpp:135
+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:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handelen is niet mogelijk. Personage bestaat niet."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel onderbroken vanwege een onbekende reden."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handelen: Jij en %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel met %s geannuleerd."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:237
+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:242
+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:247
+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:251
+msgid "Failed adding item for unknown reason."
+msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Handel geannuleerd."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Handel voltooid."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Say '...'"
@@ -6088,3 +5857,171 @@ msgstr "Magie %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Onbekend voorwerp"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Kon Map Niet Laden"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Fout bij het laden van %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Kracht %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Behendigheid %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Handigheid %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Vitality %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Intelligentie %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Wilskracht"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Wilskracht %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Klik OK om opnieuw te verschijnen."
+
+#~ msgid "You Died"
+#~ msgstr "Je bent gestorven"
+
+#~ msgid "Not logged in."
+#~ msgstr "Niet ingelogd"
+
+#~ msgid "Invalid name."
+#~ msgstr "Ongeldige naam."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Naam van personage bestaat al."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Ongeldige haarstijl."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Ongeldige haarkleur."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Ongeldig geslacht."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Statistieken van personage zijn te hoog."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Statistieken van personage zijn te laag."
+
+#~ msgid "Player deleted."
+#~ msgstr "Speler verwijderd."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Onbekende fout (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Geen gameservers beschikbaar."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Onderwerp: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Spelers in dit kanaal:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Fout bij binnenkomen ruimte."
+
+#~ msgid "Listing channels."
+#~ msgstr "Lijst van ruimtes."
+
+#~ msgid "End of channel list."
+#~ msgstr "Einde van lijst van ruimtes."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s is de ruimte binnengekomen."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s verliet de ruimte."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s heeft modus %s gezet op gebruiker %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s heeft %s eruit geschopt."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Onbekend ruimte gebeurtenis."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Fout bij aanmaken guild."
+
+#~ msgid "Invite sent."
+#~ msgstr "Uitnodiging verzonden."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Lid is succesvol gepromoveerd."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Kon lid niet promoveren."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Verkeerd magic_token."
+
+#~ msgid "Already logged in."
+#~ msgstr "Je bent al ingelogd."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Nieuw wachtwoord is ongeldig."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Account niet verbonden. Log eerst in aub."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Nieuw email adres is ongeldig."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Oud email adres is ongeldig."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "Het nieuwe email adres bestaat reeds."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Client registratie is niet toegestaan. Contacteer aub de server "
+#~ "adminstratie."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Client versie is te oud."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Verkeerde gebruikersnaam of wachtwoord."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Verkeerde gebruikersnaam, wachtwoord of email adres."
+
+#~ msgid "Username already exists."
+#~ msgstr "Gebruikersnaam bestaat al."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Email adres bestaat al."
+
+#~ msgid "Joined party."
+#~ msgstr "Bijgevoegd bij groep."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s heeft zich bij de groep gevoegd."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s heeft uw uitnodiging geweigerd."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Inkomende handelsaanvragen accepteren."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Inkomende handelsaanvragen negeren."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Handelen met %s"
diff --git a/po/pl.po b/po/pl.po
index 418f924ba..fbf2f15ba 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
@@ -55,113 +55,112 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Konfiguracja"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Wydajność programu"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Ekran"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Skórki"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Logowanie"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Zmiana serwera"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Błąd"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Zmiana hasła"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Nieprawidłowy serwer aktualizacji: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Nieznane polecenie."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Nie można wysłać pustych szeptów!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -169,105 +168,105 @@ msgid ""
msgstr ""
"Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty."
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Prośba o dołączenie do kanału %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Brakuje nazwy grupy."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Brak nazwy gildii."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Proszę wpisać prawidłową nazwę."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Return włącza czat."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Wiadomość zamyka czat."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Return od teraz włącza czat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Wiadomość od teraz zamyka czat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "znajomy"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "lekceważony"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutralny"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Gracz jest już %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Gracz jest teraz %s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Gracz nie może być %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Gracz nie był ignorowany!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Gracz już nie jest ignorowany!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Gracz nie może być odignorowany!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "dodany/a do czarnej listy"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "wróg"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Gracz został usunięty!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Gracz usunięty z powodzeniem!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Gracz nie mógł zostać usunięty!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Czas pracy programu: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -275,7 +274,7 @@ msgstr[0] "%d tydzień"
msgstr[1] "%d tygodni/e"
msgstr[2] "%d tygodni/e"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -283,7 +282,7 @@ msgstr[0] "%d dzień"
msgstr[1] "%d dni"
msgstr[2] "%d dni"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -291,7 +290,7 @@ msgstr[0] "%d godzina"
msgstr[1] "%d godzin/y"
msgstr[2] "%d godzin/y"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -299,7 +298,7 @@ msgstr[0] "%d minuta"
msgstr[1] "%d minut/y"
msgstr[2] "%d minut/y"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -307,27 +306,27 @@ msgstr[0] "%d sekunda"
msgstr[1] "%d sekund/y"
msgstr[2] "%d sekund/y"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "rozmiar cache czcionki"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Rozmiar cache:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Stworzono:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Usunięto:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Obrazy źródłowe:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Osierocone obrazy źródłowe:"
@@ -336,39 +335,30 @@ msgstr "Osierocone obrazy źródłowe:"
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Ogólny"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Zrzut ekranu zapisany jako"
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Połączenie z serwerem zostało zerwane."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Błąd sieci"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Nie można załadować mapy"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Błąd podczas łądowania %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -399,7 +389,8 @@ msgstr "Imię"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Atak"
@@ -419,13 +410,13 @@ msgstr "Podejdź"
msgid "Result"
msgstr "Rezultat"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Resetuj"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Kup"
@@ -442,7 +433,7 @@ msgstr "Ilość:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -450,14 +441,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Wyjdź"
@@ -474,25 +465,25 @@ msgid "Shop"
msgstr "Sklep"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Sprzedaj"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -563,7 +554,7 @@ msgstr "Potwierdzenie hasła nie zgadza się."
msgid "New Character"
msgstr "Nowa postać"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nazwa:"
@@ -674,7 +665,7 @@ msgstr "Wprowadź hasło aby usunąć postać"
msgid "Enter password:"
msgstr "Wprowadź hasło:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -754,7 +745,7 @@ msgstr "tęczowy 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -784,9 +775,9 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignoruj"
@@ -950,7 +941,7 @@ msgid "Did You Know?"
msgstr "Cz wiesz że..."
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Zamknij"
@@ -967,33 +958,33 @@ msgstr "Dalej>"
msgid "Auto open this window"
msgstr "Otwieraj to okno automatycznie"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Edytuj serwer"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Adres:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Port:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Typ serwera:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Opis:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "Wymagany zarówno adres jak i port serwera."
@@ -1002,8 +993,8 @@ msgid "Equipment"
msgstr "Ekwipunek"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Zdejmij"
@@ -1045,26 +1036,26 @@ msgid "Filter:"
msgstr "Filtr:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Załóż"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Użyj"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Upuść..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Podziel"
@@ -1078,17 +1069,17 @@ msgid "Weight:"
msgstr "Waga:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Przechowaj"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Pobierz"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Upuść"
@@ -1326,24 +1317,24 @@ msgstr "pasek statusu"
msgid "Need"
msgstr "Potrzeba"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Przerwij"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Dalej"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Zatwierdź"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Wyczyść"
@@ -1415,7 +1406,7 @@ msgid "Nuke"
msgstr "Wysadź w powietrze"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Dodaj komentarz"
@@ -1435,7 +1426,7 @@ msgstr "Dodaj do listy priorytetów"
msgid "Add to attack list"
msgstr "Dodaj do listy atakowanych"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Dodaj do listy ignorowanych"
@@ -1448,7 +1439,7 @@ msgid "Players"
msgstr "Gracze"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Wyrzuć z grupy"
@@ -1456,8 +1447,8 @@ msgstr "Wyrzuć z grupy"
msgid "Pick up"
msgstr "Podnieś"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Dodaj do czatu"
@@ -1469,8 +1460,8 @@ msgstr "Portal"
msgid "Rename"
msgstr "Zmień nazwę"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Usuń"
@@ -1526,7 +1517,7 @@ msgstr "Opuść"
msgid "Copy to clipboard"
msgstr "Skopiuj do schowka"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Zaproś do grupy"
@@ -1535,170 +1526,185 @@ msgid "Change guild position"
msgstr "Zmień pozycję gildii"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Zmień nazwę drogowskazu"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nick:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Komentarz gracza "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Komentarz: "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Dodaj do handlu"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Dodaj 10 do handlu"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Dodaj połowę do handlu"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Dodaj wszystko do handlu"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Dodaj wszystko do handlu"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Przechowaj 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Przechowaj połowę"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Przechowaj wszystko"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Przechowaj wszystko"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Upuść wszystko"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Odbierz 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Odbierz połowę"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Odbierz wszystko"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Odbierz wszystko"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Wyczyść okno upuszczeń."
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Ukryj"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Pokaż"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Zresetuj żółty pasek"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Skopiuj do czatu"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(domyślne)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "W górę"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "W dół"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Rozbierz"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Dodaj do znajomych"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Lekceważ"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Czarna lista"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Ustaw jako wroga"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Usuń"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Odignoruj"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Całkowicie ignoruj"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Podążaj"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imituj"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Kup (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Sprzedaj (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Pokaż przedmioty"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr "Usuń z listy podnoszonych"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr "Dodaj do listy podnoszonych"
@@ -1742,58 +1748,58 @@ msgstr "Hasło nie może mieć więcej niż %d znaków."
msgid "Passwords do not match."
msgstr "Hasła nie zgadzają się."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Wybierz serwer"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Wybierz serwer ***TRYB BEZPIECZEŃSTWA***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Użyj tego samego IP dla podserwerów"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Załaduj"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Połącz"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Dodaj"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Edycja"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Ściąganie listy serwerów... %2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Czekanie na serwer..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Przygotowanie ściągania"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Błąd przy uzyskiwaniu listy serwerów!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "wymaga nowszej wersji"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "wymaga v%s"
@@ -2627,11 +2633,11 @@ msgstr "Zresetuj wszystkie klawisze"
msgid "Default"
msgstr "Domyślne"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Wykryto konflikt klawiszy."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2640,7 +2646,7 @@ msgstr ""
"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
"się problemy."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr "nieznane"
@@ -3092,131 +3098,162 @@ msgstr "Relacje"
msgid "When ignoring:"
msgstr "Gdy ignorowany:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Bardzo mała (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Mała (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Średnia (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normalna"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Duża (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Duża (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Bardzo duża (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "Ogromna (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "Ogromna (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Chinese (China)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Czech"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "English"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Finnish"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "French"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "German"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonesian"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Polish"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japanese"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Dutch (Belgium/Flemish)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Portuguese"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Portuguese (Brazilian)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Russian"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Spanish (Castilian)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Skórka"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Skórka GUI"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Język"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Główna czcionka"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Pogrubiona czcionka"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Czcionka efektów"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Czcionka pomocy"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Bezpieczna czcionka"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Japońska czcionka"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Rozmiar czcionki"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Rozmiar czcionki"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Skórka zmieniona"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
@@ -3456,7 +3493,6 @@ msgid "Auction"
msgstr "Aukcja"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Prośba o handel"
@@ -4376,7 +4412,7 @@ msgstr "Przeloguj się"
msgid "Choose World"
msgstr "Wybierz świat"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "key_%d"
@@ -4398,7 +4434,7 @@ msgid "JB%d"
msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "(nieznany)"
@@ -4746,7 +4782,7 @@ msgstr "Imitujesz: "
msgid "Imitation canceled"
msgstr "Imitacja anulowana"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Widzisz "
@@ -4918,7 +4954,7 @@ msgstr "Nieprawidłowe miejsce inwentarza."
msgid "Incorrect race."
msgstr "Nieprawidłowa rasa."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Info"
@@ -4984,7 +5020,7 @@ msgstr "Gra"
msgid "Request to quit denied!"
msgstr "Żądanie wyjścia odrzucone!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Gildia została utworzona."
@@ -5209,7 +5245,7 @@ msgstr "Nie można założyć."
msgid "Account was not found. Please re-login."
msgstr "Konto nie znalezione. Prosimy się przelogować."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Stare hasło nieprawidłowe."
@@ -5218,9 +5254,6 @@ msgid "New password too short."
msgstr "Nowe hasło jest zbyt krótkie."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Nieznany błąd."
@@ -5322,23 +5355,23 @@ msgstr "%s opuścił/a Twoją grupę."
msgid "An unknown member tried to say: %s"
msgstr "Nieznany członek grupy chciał powiedzieć: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Jesteś martwy/a."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "Z ubolewaniem powiadamiamy, iż Twoja postać poległa w bitwie."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Już nie jesteś taki żywy."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Skostniałe łapy ponurego żniwiarza sięgają po Twoją duszę."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Koniec gry!"
@@ -5346,7 +5379,7 @@ msgstr "Koniec gry!"
msgid "Insert coin to continue."
msgstr "Wrzuć żeton aby kontynuować."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5354,34 +5387,34 @@ msgstr ""
"Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
"do lepszego miejsca."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
"Twój plan zniszczenia broni wrogów poprzez uderzanie o nią gardłem zawiódł."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Czy chesz zidentyfikować swoje rzeczy?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Niestety, ślad po Tobie zaginął..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Unicestwiony."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Wygląda na to, że podano tobie twoją głowę."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "Znowu nawaliłeś, wrzuć swoje ciało do ścieku i kup sobie nowe."
@@ -5557,497 +5590,233 @@ msgstr "Nie udało się niczego ukraść..."
msgid "Poison had no effect..."
msgstr "Trucizna nie zadziałała..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s chce handlować z Tobą, zgadzasz się?"
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handel niemożliwy. Partner handlowy jest zbyt daleko."
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handel niemożliwy. Postać nie istnieje."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel anulowany z nieznanych powodów."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handel: Ty i %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel z %s anulowany."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Nieobsługiwany pakiet anulowania handlu."
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciążona."
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
-"inwentarzu."
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr "Nie można dodać przedmiotu. Tym przedmiotem nie można handlować."
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr "Nie można dodać przedmiotu z niewiadomych przyczyn."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Handel anulowany."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Handel zakończony."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Siła"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Siła %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Zwinność"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Szybkość %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Zręczność"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Zręczność %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Witalność"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Witalność %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Inteligencja"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Inteligencja %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Siła woli"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Siła woli %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Naciśnij OK aby się zrespawnować."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Padłeś."
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Nie jesteś zalogowany/a."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Nie ma dostępnych miejsc."
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Błędna nazwa."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Imię postaci już wykorzystane."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Błędna fryzura."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Błędny kolor włosów."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Błędna płeć."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Staty postaci są zbyt wysokie."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Staty postaci są zbyt niskie."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr "Przynajmniej jeden stat jest poza dozwolonym zakresem: (%u - %u)."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Błędny numer miejsca w inwentarzu."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Gracz skasowany."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Zaznaczenie poza limitami."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Nieznany błąd (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Brak dostępnych serwerów gier"
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Temat: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Gracze w tym pokoju:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Błąd w przyłączaniu się do pokoju."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Lista pokojów."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Koniec listy pokojów."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s wchodzi do pokoju."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s opuścił/a pokój."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s nadał/a tryb %s użytkownikowi %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s wyrzucił/a %s."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Nieznane wydarzenie pokoju."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Błąd podczas tworzenia gildii."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Zaproszenie wysłane."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Członek został pomyślnie wypromowany."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Promocja członka nie powiodła się."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Nieprawidłowy magic_token."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Już zalogowano."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Konto zbanowane."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Nowe hasło nieprawidłowe."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Konto niepołączone. Proszę najpierw się zalogować."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Nowy adres e-mail nieprawidłowy."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Stary adres e-mail nieprawidłowy."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "Nowy adres e-mail już zarejestrowany."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Rejestracja przez program zablokowana. Proszę skontaktować się z "
-"administracją serwera."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Wersja klienta jest zbyt stara."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Nieprawidłowy login lub hasło."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Konto zbanowane."
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "Próba zalogowania zbyt wcześnie po poprzedniej próbie."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Niepoprawny login, hasło lub adres e-mail."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Login już istnieje."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Adres e-mail już zarejestrowany."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Captcha zabrała Ci zbyt wiele czasu, albo została źle rozwiązana."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Dołączono do grupy."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s dołączył do grupy."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s odrzucił/a Twoje zaproszenie."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Akceptowanie nadchodzących próśb o handel."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorowanie nadchodzących próśb o handel."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Handel z %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Wykopanie nie powiodło się!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Wykopanie powiodło się!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Dziękuję za sprzedaż."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Nie można sprzedać."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Nie można sprzedawać podczas handlowania."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Nie można sprzedać- niesprzedawalny przedmiot"
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Siła %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Zwinność %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Witalność %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligencja %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Zręczność %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Szczęście %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Błąd uwierzytelniania."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Brak dostępnych serwerów."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Ktoś inny próbuje użyć konta."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "To konto jest już zalogowane."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Wykryto speed hack."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Zduplikowany login."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Nieznany błąd połączenia."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Rozłączono z serwerem!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Siła"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Zwinność"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Witalność"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Inteligencja"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Zręczność"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Szczęście"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Obrona"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "Atak mag."
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "Obrona mag."
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% celności"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% uników"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% ciosów kryt."
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Opóźnienie ataku"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Opóźnienie chodu"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Zasięg ataku"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Obrażenia na sek."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Network::connect() otrzymał pusty adres!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Nie można było odnaleźć serwera."
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Połączenie z serwerem przerwane."
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s nie jest w twojej grupie!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s chce handlować z Tobą, zgadzasz się?"
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handel niemożliwy. Partner handlowy jest zbyt daleko."
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handel niemożliwy. Postać nie istnieje."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel anulowany z nieznanych powodów."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handel: Ty i %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel z %s anulowany."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Nieobsługiwany pakiet anulowania handlu."
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciążona."
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
+"inwentarzu."
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr "Nie można dodać przedmiotu. Tym przedmiotem nie można handlować."
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr "Nie można dodać przedmiotu z niewiadomych przyczyn."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Handel anulowany."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Handel zakończony."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Pisz '...'"
@@ -6092,3 +5861,195 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Nieznany przedmiot"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Nie można załadować mapy"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Błąd podczas łądowania %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Siła %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Szybkość %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Zręczność %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Witalność %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Inteligencja %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Siła woli"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Siła woli %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Naciśnij OK aby się zrespawnować."
+
+#~ msgid "You Died"
+#~ msgstr "Padłeś."
+
+#~ msgid "Not logged in."
+#~ msgstr "Nie jesteś zalogowany/a."
+
+#~ msgid "No empty slot."
+#~ msgstr "Nie ma dostępnych miejsc."
+
+#~ msgid "Invalid name."
+#~ msgstr "Błędna nazwa."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Imię postaci już wykorzystane."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Błędna fryzura."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Błędny kolor włosów."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Błędna płeć."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Staty postaci są zbyt wysokie."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Staty postaci są zbyt niskie."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr "Przynajmniej jeden stat jest poza dozwolonym zakresem: (%u - %u)."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Błędny numer miejsca w inwentarzu."
+
+#~ msgid "Player deleted."
+#~ msgstr "Gracz skasowany."
+
+#~ msgid "Selection out of range."
+#~ msgstr "Zaznaczenie poza limitami."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Nieznany błąd (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Brak dostępnych serwerów gier"
+
+#~ msgid "Topic: %s"
+#~ msgstr "Temat: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Gracze w tym pokoju:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Błąd w przyłączaniu się do pokoju."
+
+#~ msgid "Listing channels."
+#~ msgstr "Lista pokojów."
+
+#~ msgid "End of channel list."
+#~ msgstr "Koniec listy pokojów."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s wchodzi do pokoju."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s opuścił/a pokój."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s nadał/a tryb %s użytkownikowi %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s wyrzucił/a %s."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Nieznane wydarzenie pokoju."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Błąd podczas tworzenia gildii."
+
+#~ msgid "Invite sent."
+#~ msgstr "Zaproszenie wysłane."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Członek został pomyślnie wypromowany."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Promocja członka nie powiodła się."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Nieprawidłowy magic_token."
+
+#~ msgid "Already logged in."
+#~ msgstr "Już zalogowano."
+
+#~ msgid "Account banned."
+#~ msgstr "Konto zbanowane."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Nowe hasło nieprawidłowe."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Konto niepołączone. Proszę najpierw się zalogować."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Nowy adres e-mail nieprawidłowy."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Stary adres e-mail nieprawidłowy."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "Nowy adres e-mail już zarejestrowany."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Rejestracja przez program zablokowana. Proszę skontaktować się z "
+#~ "administracją serwera."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Wersja klienta jest zbyt stara."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Nieprawidłowy login lub hasło."
+
+#~ msgid "Account banned"
+#~ msgstr "Konto zbanowane."
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "Próba zalogowania zbyt wcześnie po poprzedniej próbie."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Niepoprawny login, hasło lub adres e-mail."
+
+#~ msgid "Username already exists."
+#~ msgstr "Login już istnieje."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Adres e-mail już zarejestrowany."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "Captcha zabrała Ci zbyt wiele czasu, albo została źle rozwiązana."
+
+#~ msgid "Joined party."
+#~ msgstr "Dołączono do grupy."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s dołączył do grupy."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s odrzucił/a Twoje zaproszenie."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Akceptowanie nadchodzących próśb o handel."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Ignorowanie nadchodzących próśb o handel."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Handel z %s"
diff --git a/po/pt.po b/po/pt.po
index 809911ab9..742260431 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,10 +10,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
-"PO-Revision-Date: 2012-06-21 20:34+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
+"PO-Revision-Date: 2012-06-24 21:34+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
"language/pt/)\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -55,113 +55,112 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -170,160 +169,160 @@ 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:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "amigo(a)"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador(a)!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "Na Lista Negra"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "Inimigo"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "Tamanho do cache de fonte"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Tamanho de Cache:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Recursos de imagens:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
@@ -333,39 +332,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Geral"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Não foi possível carregar o mapa"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Erro ao carregar %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -396,7 +386,8 @@ msgstr "Nome"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Atacar"
@@ -416,13 +407,13 @@ msgstr "Mover"
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Resetar"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Comprar"
@@ -439,7 +430,7 @@ msgstr "Quantidade:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -447,14 +438,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Sair"
@@ -471,25 +462,25 @@ msgid "Shop"
msgstr "Loja"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -560,7 +551,7 @@ msgstr "As novas senhas não são iguais."
msgid "New Character"
msgstr "Novo Pesonagem"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nome:"
@@ -671,7 +662,7 @@ msgstr "Entre com a Senha para Deletar o usuario"
msgid "Enter password:"
msgstr "Entre com a senha"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -751,7 +742,7 @@ msgstr "arco-íris 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -781,9 +772,9 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignora"
@@ -857,7 +848,7 @@ msgstr "%d FPS"
#: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:265
#, c-format
msgid "%d LPS"
-msgstr ""
+msgstr "%d LPS"
#: src/gui/debugwindow.cpp:192 src/gui/debugwindow.cpp:244
msgid "Textures count:"
@@ -947,7 +938,7 @@ msgid "Did You Know?"
msgstr "Você sabia?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Fechar"
@@ -964,33 +955,33 @@ msgstr "Próximo >"
msgid "Auto open this window"
msgstr "Abrir automaticamente esta janela"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Editar Servidor"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Endereço:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Porta:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Descrição:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "Por favor coloque ao menos uma porta de servidor."
@@ -999,8 +990,8 @@ msgid "Equipment"
msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Desequipar"
@@ -1042,26 +1033,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Dividir"
@@ -1075,17 +1066,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Descartar"
@@ -1174,14 +1165,14 @@ msgstr "Mortes: %s, total exp: %s"
#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
-msgstr ""
+msgstr "Média Exp: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Nu. de mob para próximo level: %s"
#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
@@ -1321,24 +1312,24 @@ msgstr "Barra de Status"
msgid "Need"
msgstr "Precisa"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Aguarde..."
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Próximo"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Enviar"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Limpar"
@@ -1410,7 +1401,7 @@ msgid "Nuke"
msgstr "Desaparecer"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Adicionar comentário"
@@ -1430,7 +1421,7 @@ msgstr "Adicionar a prioridade na lista de ataques"
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
@@ -1443,7 +1434,7 @@ msgid "Players"
msgstr "Jogadores"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Chutar do grupo"
@@ -1451,8 +1442,8 @@ msgstr "Chutar do grupo"
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Nome no chat"
@@ -1464,8 +1455,8 @@ msgstr "Mapa Item"
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "A Remover"
@@ -1521,7 +1512,7 @@ msgstr "Sair"
msgid "Copy to clipboard"
msgstr "CopiaCopiar para a área de transferência"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Convidar para grupo"
@@ -1530,172 +1521,187 @@ msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Add. todos na negociação"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Guardar tudo"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Retirar tudo"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Queda nítida de janela"
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copiar para o chat"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Mover a baixo"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Limpar conjunto de roupas"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Ser Amigo(a)"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Ser inimigo(a)"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Definir como inimigo(a)"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Mostar itens"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
-msgstr ""
+msgstr "Remover lista de pegar itens"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
-msgstr ""
+msgstr "Adicionar na lista de pegar itens"
#: src/gui/quitdialog.cpp:52
msgid "Switch server"
@@ -1737,65 +1743,65 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Escolha seu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Escolha seu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Usar o mesmo ip para os sub servidores do jogo"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Carregar"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Adicionar"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Editar"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Aguardando servidor..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Preparando download"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
#: src/gui/setupactiondata.h:48
msgid "Target and attack keys"
-msgstr ""
+msgstr "Teclas de Alvo e Ataque"
#: src/gui/setupactiondata.h:58
msgid "Target & Attack"
@@ -1875,7 +1881,7 @@ msgstr "Selecionar OK"
#: src/gui/setupactiondata.h:172
msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "Atalhos de teclas midificadoras"
#: src/gui/setupactiondata.h:177
msgid "Item Shortcuts Key"
@@ -1883,7 +1889,7 @@ msgstr "Atalhos de item"
#: src/gui/setupactiondata.h:182
msgid "Shortcuts keys"
-msgstr ""
+msgstr "Teclas de atalhos"
#: src/gui/setupactiondata.h:187 src/gui/setupactiondata.h:192
#: src/gui/setupactiondata.h:197 src/gui/setupactiondata.h:202
@@ -1993,15 +1999,15 @@ msgstr "Próxima aba social"
#: src/gui/setupactiondata.h:420
msgid "Emote modifiers keys"
-msgstr ""
+msgstr "Teclas de modificadores de emoções"
#: src/gui/setupactiondata.h:425
msgid "Emote modifier key"
-msgstr ""
+msgstr "Tecla modificador de emoção"
#: src/gui/setupactiondata.h:430
msgid "Emote shortcuts"
-msgstr ""
+msgstr "Atalhos de emoções"
#: src/gui/setupactiondata.h:435 src/gui/setupactiondata.h:440
#: src/gui/setupactiondata.h:445 src/gui/setupactiondata.h:450
@@ -2033,7 +2039,7 @@ msgstr "Atalho para emoticon %d"
#: src/gui/setupactiondata.h:684
msgid "Outfits keys"
-msgstr ""
+msgstr "Teclas de roupas"
#: src/gui/setupactiondata.h:689
msgid "Wear Outfit"
@@ -2049,7 +2055,7 @@ msgstr "Copiar roupa equipada"
#: src/gui/setupactiondata.h:704
msgid "Outfits shortcuts"
-msgstr ""
+msgstr "Atalhos de roupas"
#: src/gui/setupactiondata.h:709 src/gui/setupactiondata.h:714
#: src/gui/setupactiondata.h:719 src/gui/setupactiondata.h:724
@@ -2077,7 +2083,7 @@ msgstr ""
#: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:944
#, c-format
msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "Atalho de roupa: %d"
#: src/gui/setupactiondata.h:958
msgid "Toggle Chat"
@@ -2221,7 +2227,7 @@ msgstr "Modificar chave"
#: src/gui/setupactiondata.h:1151
msgid "Move Keys"
-msgstr ""
+msgstr "Teclas de movimento"
#: src/gui/setupactiondata.h:1156 src/gui/setupactiondata.h:1435
msgid "Move Up"
@@ -2241,7 +2247,7 @@ msgstr "Direita"
#: src/gui/setupactiondata.h:1176
msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "Atalho para mover para ponto de navegação"
#: src/gui/setupactiondata.h:1181 src/gui/setupactiondata.h:1186
#: src/gui/setupactiondata.h:1191 src/gui/setupactiondata.h:1196
@@ -2269,55 +2275,55 @@ msgstr ""
#: src/gui/setupactiondata.h:1411 src/gui/setupactiondata.h:1416
#, c-format
msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "Mover para ponto %d"
#: src/gui/setupactiondata.h:1430
msgid "Move & selection"
-msgstr ""
+msgstr "Move & Seleção"
#: src/gui/setupactiondata.h:1455
msgid "Move Home"
-msgstr ""
+msgstr "Mover para Home"
#: src/gui/setupactiondata.h:1460
msgid "Move End"
-msgstr ""
+msgstr "Mover para End"
#: src/gui/setupactiondata.h:1465
msgid "Page up"
-msgstr ""
+msgstr "Page up"
#: src/gui/setupactiondata.h:1470
msgid "Page down"
-msgstr ""
+msgstr "Page down"
#: src/gui/setupactiondata.h:1480
msgid "Select"
-msgstr ""
+msgstr "Selecionar"
#: src/gui/setupactiondata.h:1485
msgid "Select2"
-msgstr ""
+msgstr "Selecionar2"
#: src/gui/setupactiondata.h:1500
msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
#: src/gui/setupactiondata.h:1505
msgid "Insert"
-msgstr ""
+msgstr "Inserir"
#: src/gui/setupactiondata.h:1510
msgid "Tab"
-msgstr ""
+msgstr "Tab"
#: src/gui/setupactiondata.h:1515
msgid "Mod"
-msgstr ""
+msgstr "Mod"
#: src/gui/setupactiondata.h:1541
msgid "Basic"
-msgstr ""
+msgstr "Básico"
#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
msgid "Shortcuts"
@@ -2329,11 +2335,11 @@ msgstr "Janelas"
#: src/gui/setupactiondata.h:1545
msgid "Emotes"
-msgstr ""
+msgstr "Emoções"
#: src/gui/setupactiondata.h:1549
msgid "Gui"
-msgstr ""
+msgstr "Gui"
#: src/gui/setup_audio.cpp:44
msgid "(no sound)"
@@ -2373,27 +2379,27 @@ msgstr "Volume da Música"
#: src/gui/setup_audio.cpp:82
msgid "Audio frequency"
-msgstr ""
+msgstr "Frequência de Áudio"
#: src/gui/setup_audio.cpp:86
msgid "mono"
-msgstr ""
+msgstr "mono"
#: src/gui/setup_audio.cpp:87
msgid "stereo"
-msgstr ""
+msgstr "stereo"
#: src/gui/setup_audio.cpp:88
msgid "surround"
-msgstr ""
+msgstr "surround"
#: src/gui/setup_audio.cpp:89
msgid "surround+center+lfe"
-msgstr ""
+msgstr "surround+center+lfe"
#: src/gui/setup_audio.cpp:90
msgid "Audio channels"
-msgstr ""
+msgstr "Canais de áudio"
#: src/gui/setup_audio.cpp:94
msgid "Sound effects"
@@ -2616,17 +2622,17 @@ msgstr "Retirar"
#: src/gui/setup_input.cpp:132
msgid "Reset all keys"
-msgstr ""
+msgstr "Resetar todas teclas"
#: src/gui/setup_input.cpp:135
msgid "Default"
msgstr "Padrão"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Conflitos de teclas detectado."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2635,9 +2641,9 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
msgid "Press the button to start calibration"
@@ -2749,7 +2755,7 @@ msgstr "Atacar enquanto se move"
#: src/gui/setup_other.cpp:104
msgid "Attack next target"
-msgstr ""
+msgstr "Atacar próximo alvo"
#: src/gui/setup_other.cpp:107
msgid "Sync player move"
@@ -2797,7 +2803,7 @@ msgstr "A habilitar filtro de ataque"
#: src/gui/setup_other.cpp:140
msgid "Enable pickup filter"
-msgstr ""
+msgstr "Habilitar filtro de pegar itens"
#: src/gui/setup_other.cpp:143
msgid "Enable advert protocol"
@@ -2829,15 +2835,15 @@ msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
#: src/gui/setup_other.cpp:172
msgid "Keyboard"
-msgstr ""
+msgstr "Teclado"
#: src/gui/setup_other.cpp:174
msgid "Repeat delay"
-msgstr ""
+msgstr "Atraso de repetição"
#: src/gui/setup_other.cpp:177
msgid "Repeat interval"
-msgstr ""
+msgstr "Intervalo de repetição"
#: src/gui/setup_other.cpp:184
msgid "Always show"
@@ -2909,7 +2915,7 @@ msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
#: src/gui/setup_other.cpp:235
msgid "Network delay between sub servers"
-msgstr ""
+msgstr "Atraso de rede entre os sub servidores"
#: src/gui/setup_other.cpp:238
msgid "Show background"
@@ -2937,11 +2943,11 @@ msgstr "Habilitar redução de mapa (Software)"
#: src/gui/setup_perfomance.cpp:69
msgid "Enable compound sprite delay (Software)"
-msgstr ""
+msgstr "Habilitar atraso de sprite composto (Software)"
#: src/gui/setup_perfomance.cpp:72
msgid "Enable delayed images load (OpenGL)"
-msgstr ""
+msgstr "Habilitar atraso em carregamento de imagens (OpenGL)"
#: src/gui/setup_perfomance.cpp:75
msgid "Better quality (disable for better perfomance)"
@@ -2973,19 +2979,19 @@ msgstr "Desabilitar cache (Software)"
#: src/gui/setup_perfomance.cpp:99
msgid "Different options (enable or disable can improve perfomance)"
-msgstr ""
+msgstr "Opções diferentes (habilite ou desabilite para melhor performance)"
#: src/gui/setup_perfomance.cpp:102
msgid "Enable texture compression (fast OpenGL)"
-msgstr ""
+msgstr "Habilitar compreensão de textura (OpenGl rápido)"
#: src/gui/setup_perfomance.cpp:105
msgid "Enable rectangular texture extension (OpenGL)"
-msgstr ""
+msgstr "Habilitar a extensão textura retangular (OpenGL)"
#: src/gui/setup_perfomance.cpp:108
msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Utilizar nova textura de formato interno (OpenGL)"
#: src/gui/setup_players.cpp:53
msgid "Show gender"
@@ -3037,7 +3043,7 @@ msgstr "Grupo de amigos na lista online"
#: src/gui/setup_players.cpp:89
msgid "Hide erased players nicks"
-msgstr ""
+msgstr "Ocultar nicks de jogadores apagados"
#: src/gui/setup_relations.cpp:63
msgid "Relation"
@@ -3087,131 +3093,162 @@ msgstr "Relações"
msgid "When ignoring:"
msgstr "Quando ignorar:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Minúsculo (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Pequeno (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Médio (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Largo (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Largo (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Grande (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "Enorme (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Chinês (China)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Tcheco"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Inglês"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Finlandês"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Francês"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Alemão"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonésio"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Polonês"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japonês"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Holandês (Bélgica / Flandres)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Português"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Português (Brasileiro)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Russo"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Espanhol (castelhano)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Linguagem"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Fonte"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Fonte negrito"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Fonte de particulas"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Fonte de ajuda"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Fonte Segura"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Font Jasponesa"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Tamanho da fonte"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Tamanho da fonte"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Tema alterado"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3255,7 +3292,7 @@ msgstr "Limite de FPS alternativo:"
#: src/gui/setup_video.cpp:244
msgid "Detect best mode"
-msgstr ""
+msgstr "Detectar melhor modo"
#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
@@ -3395,19 +3432,19 @@ msgstr "Detalhe de partículas"
#: src/gui/setup_visual.cpp:90
msgid "best quality"
-msgstr ""
+msgstr "Melhor qualidade"
#: src/gui/setup_visual.cpp:91
msgid "normal"
-msgstr ""
+msgstr "normal"
#: src/gui/setup_visual.cpp:92
msgid "best perfomance"
-msgstr ""
+msgstr "Melhor performance"
#: src/gui/setup_visual.cpp:93
msgid "Particle physics"
-msgstr ""
+msgstr "Física de partículas"
#: src/gui/setup_visual.cpp:98
msgid "Gamma"
@@ -3423,7 +3460,7 @@ msgstr "Vsync"
#: src/gui/setup_visual.cpp:109
msgid "Center game window"
-msgstr ""
+msgstr "Centro de janela do jogo"
#: src/gui/shopwindow.cpp:76
msgid "Personal Shop"
@@ -3450,7 +3487,6 @@ msgid "Auction"
msgstr "Leilão"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Proposta de negociação"
@@ -3595,15 +3631,15 @@ msgstr "Ignorar mobs"
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
#: src/gui/socialwindow.cpp:984
msgid "Pik"
-msgstr ""
+msgstr "Pik"
#: src/gui/socialwindow.cpp:1008
msgid "Pickup items"
-msgstr ""
+msgstr "Pegar itens"
#: src/gui/socialwindow.cpp:1009
msgid "Ignore items"
-msgstr ""
+msgstr "Ignorar itens"
#: src/gui/socialwindow.cpp:1132
msgid "Create Guild"
@@ -4060,7 +4096,7 @@ msgstr "Destaque de colisão na água"
#: src/gui/userpalette.cpp:158
msgid "Special ground collision Highlight"
-msgstr ""
+msgstr "Destaque especial em colisão de chão"
#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
@@ -4371,7 +4407,7 @@ msgstr "Trocar Login"
msgid "Choose World"
msgstr "Escolher Mundo"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "tecla_%d"
@@ -4393,7 +4429,7 @@ msgid "JB%d"
msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "Tecla u"
@@ -4740,7 +4776,7 @@ msgstr "Imitando:"
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Você vê "
@@ -4917,7 +4953,7 @@ msgstr "Slot incorreto."
msgid "Incorrect race."
msgstr "Corrida incorreta:"
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Informações"
@@ -4983,7 +5019,7 @@ msgstr "Jogo"
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Guilda criada."
@@ -5201,7 +5237,7 @@ msgstr "Impossível equipar."
msgid "Account was not found. Please re-login."
msgstr "Conta não encontrada. Por favor, tente novamente."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Senha antiga incorreta."
@@ -5210,9 +5246,6 @@ msgid "New password too short."
msgstr "Nova senha é muito curta."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Erro desconhecido."
@@ -5316,23 +5349,23 @@ msgstr "%s saiu do seu grupo."
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Você está morto(a)."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "Lamentamos informar que seu personagem foi morto em combate."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Você não me parece assim tão vivo(a)."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "As mãos frias da morte estão levando sua alma."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Fim de jogo!"
@@ -5340,7 +5373,7 @@ msgstr "Fim de jogo!"
msgid "Insert coin to continue."
msgstr "Insira uma moeda para continuar."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5348,34 +5381,34 @@ msgstr ""
"Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
"um lugar melhor."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
"Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Eu acho que as coisas não correram tão bem."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Você quer uma identificação de suas posses?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Infelizmente, seus traços nunca foram encontrados..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Aniquilado."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Parece que te ofereceram sua própria cabeça."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
@@ -5552,495 +5585,231 @@ msgstr "Não foi possível roubar nada..."
msgid "Poison had no effect..."
msgstr "Veneno não surtiu efeito..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
-
-#: src/net/ea/tradehandler.cpp:135
-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:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Negociação impossível. O personagem não existe."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Negociação cancelada devido a uma razão desconhecida."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Negociação: Você e %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Negociação com %s cancelada."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Troca injusta pacote cancelado."
-
-#: src/net/ea/tradehandler.cpp:237
-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:242
-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:247
-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:251
-msgid "Failed adding item for unknown reason."
-msgstr "Erro ao adicionar item devido a um motivo desconhecido."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Força"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Força %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Agilidade"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidade %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Destreza"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Vitalidade"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidade %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Inteligência"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelegência %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Força de Vontade"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Força de Vontade %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Clique em OK para repopular."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Você morreu"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Não está conectado."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Sem espaço"
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Nome inválido."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Nome de usuário já existe."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Estilo inválido."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Cor inválida."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Gênero inválido."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Atributos do personagem estão muito altos."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Atributos do personagem estão muito baixos."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr "O status está muito longe do permitido (%u - %u)"
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Número de slot inválido."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Personagem deletado."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Seleção fora de alcançe."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Erro desconhecido (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Não há servidores disponíveis."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Jogadores neste canal:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Erro ao entrar no canal."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Listando canais."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Fim da lista de canais."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s entrou no canal."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s saiu do canal."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s colocou o modo %s no usuário %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s expulsou %s."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Evento de canal desconhecido."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Erro ao criar Guilda."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Convite enviado."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Membro foi promovido(a) com sucesso."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Erro ao promover o membro."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Token-mágico errado."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Já está conectado."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Conta banida."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Nova senha incorreta."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Conta não conectada. Por favor, efetue o login primeiro."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Novo endereço de email incorreto."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Antigo endereço de email incorreto."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "O novo endereço de email já existe."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Registro pelo cliente não é permitido. Favor contactar o administrador do "
-"servidor."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Versão do cliente é muito antiga."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Nome de usuário ou senha inválidos."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Conta banida"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "Tentativa de login muito próxima da última tentativa."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Nome de usuário, senha ou email inválidos."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Nome de usuário já existe."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Endereço de email já existe."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Você demorou demais no Captcha ou sua resposta foi incorreta."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s recusou seu convite."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Aceitando propostas de negócios."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorando propostas de negócios."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Negociando com %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Erro na expulsão!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Expulsão bem sucedida!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Obrigado pela venda."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Impossibilitado de vender."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Não se pode vender durante uma negociação."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Não se pode vender este item."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Força %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilidade %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalidade %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligência %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destreza %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Sorte %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Falha de autenticação."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Servidores indisponíveis."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Outra pessoa está tentando utilizar esta conta."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Existe alguém conectado a esta conta."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Login duplicado."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Erro de conexão desconhecido."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Você foi desconectado(a) do servidor!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Sorte"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Defesa"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "Atq. Mágico"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "Def. Mágica"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Exatidão"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Evasão"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Críticos"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Atraso de ataque"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Atraso de movimento"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Atraso de alcance"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Dano por seg."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Endereço vazio enviado para Network::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Não foi possível determinar o host \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Conexão com o servidor interrompida. "
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
+
+#: src/net/ea/tradehandler.cpp:135
+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:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Negociação impossível. O personagem não existe."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Negociação cancelada devido a uma razão desconhecida."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Negociação: Você e %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação com %s cancelada."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Troca injusta pacote cancelado."
+
+#: src/net/ea/tradehandler.cpp:237
+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:242
+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:247
+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:251
+msgid "Failed adding item for unknown reason."
+msgstr "Erro ao adicionar item devido a um motivo desconhecido."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Imprimir '...'"
@@ -6085,3 +5854,195 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Item desconhecido"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Não foi possível carregar o mapa"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Erro ao carregar %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Força %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Agilidade %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Destreza %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Vitalidade %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Intelegência %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Força de Vontade"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Força de Vontade %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Clique em OK para repopular."
+
+#~ msgid "You Died"
+#~ msgstr "Você morreu"
+
+#~ msgid "Not logged in."
+#~ msgstr "Não está conectado."
+
+#~ msgid "No empty slot."
+#~ msgstr "Sem espaço"
+
+#~ msgid "Invalid name."
+#~ msgstr "Nome inválido."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Nome de usuário já existe."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Estilo inválido."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Cor inválida."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Gênero inválido."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Atributos do personagem estão muito altos."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Atributos do personagem estão muito baixos."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr "O status está muito longe do permitido (%u - %u)"
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Número de slot inválido."
+
+#~ msgid "Player deleted."
+#~ msgstr "Personagem deletado."
+
+#~ msgid "Selection out of range."
+#~ msgstr "Seleção fora de alcançe."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Erro desconhecido (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Não há servidores disponíveis."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Tópico: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Jogadores neste canal:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Erro ao entrar no canal."
+
+#~ msgid "Listing channels."
+#~ msgstr "Listando canais."
+
+#~ msgid "End of channel list."
+#~ msgstr "Fim da lista de canais."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s entrou no canal."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s saiu do canal."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s colocou o modo %s no usuário %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s expulsou %s."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Evento de canal desconhecido."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Erro ao criar Guilda."
+
+#~ msgid "Invite sent."
+#~ msgstr "Convite enviado."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Membro foi promovido(a) com sucesso."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Erro ao promover o membro."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Token-mágico errado."
+
+#~ msgid "Already logged in."
+#~ msgstr "Já está conectado."
+
+#~ msgid "Account banned."
+#~ msgstr "Conta banida."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Nova senha incorreta."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Conta não conectada. Por favor, efetue o login primeiro."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Novo endereço de email incorreto."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Antigo endereço de email incorreto."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "O novo endereço de email já existe."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Registro pelo cliente não é permitido. Favor contactar o administrador do "
+#~ "servidor."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Versão do cliente é muito antiga."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Nome de usuário ou senha inválidos."
+
+#~ msgid "Account banned"
+#~ msgstr "Conta banida"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "Tentativa de login muito próxima da última tentativa."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Nome de usuário, senha ou email inválidos."
+
+#~ msgid "Username already exists."
+#~ msgstr "Nome de usuário já existe."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Endereço de email já existe."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "Você demorou demais no Captcha ou sua resposta foi incorreta."
+
+#~ msgid "Joined party."
+#~ msgstr "Entrou para o grupo."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s entrou para o grupo."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s recusou seu convite."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Aceitando propostas de negócios."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Ignorando propostas de negócios."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Negociando com %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 16ab39945..ca00535a6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,10 +13,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
-"PO-Revision-Date: 2012-06-21 20:34+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
+"PO-Revision-Date: 2012-06-24 21:13+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"manaplus/language/pt_BR/)\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -58,113 +58,112 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Fazendo login"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Requerindo personagens"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
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:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -173,160 +172,160 @@ 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:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "amigo(a)"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pôde ser %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "O jogador não está mais sendo ignorado!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "Na Lista Negra"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "inimigo"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Jogador não pôde ser apagado!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "Tamanho de fonte Cache"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Tamanho de cache:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Recursos de imagem:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
@@ -336,39 +335,30 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Geral"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Não foi possível carregar o mapa"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Erro ao carregar %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -399,7 +389,8 @@ msgstr "Nome"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Atacar"
@@ -419,13 +410,13 @@ msgstr "Mover"
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Resetar"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Comprar"
@@ -442,7 +433,7 @@ msgstr "Quantidade:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -450,14 +441,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Sair"
@@ -474,25 +465,25 @@ msgid "Shop"
msgstr "Loja"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -563,7 +554,7 @@ msgstr "As novas senhas não são iguais."
msgid "New Character"
msgstr "Novo Personagem"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Nome:"
@@ -674,7 +665,7 @@ msgstr "Entre com a senha para apagar o personagem"
msgid "Enter password:"
msgstr "Entre com a senha:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -754,7 +745,7 @@ msgstr "arco-íris 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -784,9 +775,9 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Ignora"
@@ -860,7 +851,7 @@ msgstr "%d FPS"
#: src/gui/debugwindow.cpp:179 src/gui/debugwindow.cpp:265
#, c-format
msgid "%d LPS"
-msgstr ""
+msgstr "%d LPS"
#: src/gui/debugwindow.cpp:192 src/gui/debugwindow.cpp:244
msgid "Textures count:"
@@ -950,7 +941,7 @@ msgid "Did You Know?"
msgstr "Você Sabia?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Fechar"
@@ -967,33 +958,33 @@ msgstr "Próximo >"
msgid "Auto open this window"
msgstr "Auto abrir esta janela"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Editar Servidor"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Endereço:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Porta:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Descrição:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
@@ -1002,8 +993,8 @@ msgid "Equipment"
msgstr "Equipamento"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Desequipar"
@@ -1045,26 +1036,26 @@ msgid "Filter:"
msgstr "Filtro:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Equipar"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Usar"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Dividir"
@@ -1078,17 +1069,17 @@ msgid "Weight:"
msgstr "Peso:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Descartar"
@@ -1177,14 +1168,14 @@ msgstr "Mortes: %s Total exp: %s"
#: src/gui/killstats.cpp:461
#, c-format
msgid "Avg Exp: %s"
-msgstr ""
+msgstr "Média Exp: %s"
#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:145
#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:232
#: src/gui/killstats.cpp:463
#, c-format
msgid "No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Média de mob para próximo level: %s"
#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:155
#: src/gui/killstats.cpp:239 src/gui/killstats.cpp:465
@@ -1324,24 +1315,24 @@ msgstr "Barra de Status"
msgid "Need"
msgstr "Precisa"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Parar de esperar"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Próximo"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Enviar"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Limpar"
@@ -1413,7 +1404,7 @@ msgid "Nuke"
msgstr "Desaparecer"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Add comentário"
@@ -1433,7 +1424,7 @@ msgstr "Adicionar na prioridade da lista de ataques"
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
@@ -1446,7 +1437,7 @@ msgid "Players"
msgstr "Jogadores"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Expulsar do grupo"
@@ -1454,8 +1445,8 @@ msgstr "Expulsar do grupo"
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Nome no chat"
@@ -1467,8 +1458,8 @@ msgstr "Mapa Item"
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Remover"
@@ -1524,7 +1515,7 @@ msgstr "Sair"
msgid "Copy to clipboard"
msgstr "Copiar para a área de transferência"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Convidar para grupo"
@@ -1533,172 +1524,187 @@ msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Add. todos na negociação"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Guardar tudo"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Retirar tudo"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Queda nítida de janela"
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Copiar para chat"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Mover para baixo"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Despir"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Ser amigo(a)"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Ser inimigo(a)"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Lista Negra"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Definir como inimigo"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "vender (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Mostrar itens"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
-msgstr ""
+msgstr "Remover da lista de pegar"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
-msgstr ""
+msgstr "Adicionar a lista de captura"
#: src/gui/quitdialog.cpp:52
msgid "Switch server"
@@ -1740,65 +1746,65 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Escolha seu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Escolha seu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Usar o mesmo ip para os sub servidores do jogo"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Carregar"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Adicionar"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Editar"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Aguardando servidor..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Preparando download"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
#: src/gui/setupactiondata.h:48
msgid "Target and attack keys"
-msgstr ""
+msgstr "Teclas de Alvo e ataque"
#: src/gui/setupactiondata.h:58
msgid "Target & Attack"
@@ -1878,7 +1884,7 @@ msgstr "Selecionar OK"
#: src/gui/setupactiondata.h:172
msgid "Shortcuts modifiers keys"
-msgstr ""
+msgstr "Teclas de atalho modificadoras"
#: src/gui/setupactiondata.h:177
msgid "Item Shortcuts Key"
@@ -1886,7 +1892,7 @@ msgstr "Atalhos de item"
#: src/gui/setupactiondata.h:182
msgid "Shortcuts keys"
-msgstr ""
+msgstr "Teclas de atalhos"
#: src/gui/setupactiondata.h:187 src/gui/setupactiondata.h:192
#: src/gui/setupactiondata.h:197 src/gui/setupactiondata.h:202
@@ -1996,15 +2002,15 @@ msgstr "Próxima aba social"
#: src/gui/setupactiondata.h:420
msgid "Emote modifiers keys"
-msgstr ""
+msgstr "Teclas de emoções modificadoras"
#: src/gui/setupactiondata.h:425
msgid "Emote modifier key"
-msgstr ""
+msgstr "Tecla modificadora de emoção"
#: src/gui/setupactiondata.h:430
msgid "Emote shortcuts"
-msgstr ""
+msgstr "Atalhos de emoções"
#: src/gui/setupactiondata.h:435 src/gui/setupactiondata.h:440
#: src/gui/setupactiondata.h:445 src/gui/setupactiondata.h:450
@@ -2036,7 +2042,7 @@ msgstr "Atalho para emoticon %d"
#: src/gui/setupactiondata.h:684
msgid "Outfits keys"
-msgstr ""
+msgstr "Teclas de roupas"
#: src/gui/setupactiondata.h:689
msgid "Wear Outfit"
@@ -2052,7 +2058,7 @@ msgstr "Copiar roupa equipada"
#: src/gui/setupactiondata.h:704
msgid "Outfits shortcuts"
-msgstr ""
+msgstr "Atalhos de Roupas"
#: src/gui/setupactiondata.h:709 src/gui/setupactiondata.h:714
#: src/gui/setupactiondata.h:719 src/gui/setupactiondata.h:724
@@ -2080,7 +2086,7 @@ msgstr ""
#: src/gui/setupactiondata.h:939 src/gui/setupactiondata.h:944
#, c-format
msgid "Outfit Shortcut %d"
-msgstr ""
+msgstr "Atalho de Roupa %d"
#: src/gui/setupactiondata.h:958
msgid "Toggle Chat"
@@ -2224,7 +2230,7 @@ msgstr "Chave de modificação"
#: src/gui/setupactiondata.h:1151
msgid "Move Keys"
-msgstr ""
+msgstr "Tecla de movimento"
#: src/gui/setupactiondata.h:1156 src/gui/setupactiondata.h:1435
msgid "Move Up"
@@ -2244,7 +2250,7 @@ msgstr "Direita"
#: src/gui/setupactiondata.h:1176
msgid "Move to navigation point shortcuts"
-msgstr ""
+msgstr "Atalhos de ponto de navegação"
#: src/gui/setupactiondata.h:1181 src/gui/setupactiondata.h:1186
#: src/gui/setupactiondata.h:1191 src/gui/setupactiondata.h:1196
@@ -2272,55 +2278,55 @@ msgstr ""
#: src/gui/setupactiondata.h:1411 src/gui/setupactiondata.h:1416
#, c-format
msgid "Move to point Shortcut %d"
-msgstr ""
+msgstr "Mover para o atalho %d"
#: src/gui/setupactiondata.h:1430
msgid "Move & selection"
-msgstr ""
+msgstr "Move & seleção"
#: src/gui/setupactiondata.h:1455
msgid "Move Home"
-msgstr ""
+msgstr "Mover para Home"
#: src/gui/setupactiondata.h:1460
msgid "Move End"
-msgstr ""
+msgstr "Mover para End"
#: src/gui/setupactiondata.h:1465
msgid "Page up"
-msgstr ""
+msgstr "Page up"
#: src/gui/setupactiondata.h:1470
msgid "Page down"
-msgstr ""
+msgstr "Page down"
#: src/gui/setupactiondata.h:1480
msgid "Select"
-msgstr ""
+msgstr "Selecionar"
#: src/gui/setupactiondata.h:1485
msgid "Select2"
-msgstr ""
+msgstr "Selecionar2"
#: src/gui/setupactiondata.h:1500
msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
#: src/gui/setupactiondata.h:1505
msgid "Insert"
-msgstr ""
+msgstr "Inserir"
#: src/gui/setupactiondata.h:1510
msgid "Tab"
-msgstr ""
+msgstr "Tab"
#: src/gui/setupactiondata.h:1515
msgid "Mod"
-msgstr ""
+msgstr "Mod"
#: src/gui/setupactiondata.h:1541
msgid "Basic"
-msgstr ""
+msgstr "Básico"
#: src/gui/setupactiondata.h:1543 src/gui/windowmenu.cpp:101
msgid "Shortcuts"
@@ -2332,11 +2338,11 @@ msgstr "Janelas"
#: src/gui/setupactiondata.h:1545
msgid "Emotes"
-msgstr ""
+msgstr "Emoções"
#: src/gui/setupactiondata.h:1549
msgid "Gui"
-msgstr ""
+msgstr "Gui"
#: src/gui/setup_audio.cpp:44
msgid "(no sound)"
@@ -2376,27 +2382,27 @@ msgstr "Volume da Música"
#: src/gui/setup_audio.cpp:82
msgid "Audio frequency"
-msgstr ""
+msgstr "Freqüência de áudio"
#: src/gui/setup_audio.cpp:86
msgid "mono"
-msgstr ""
+msgstr "mono"
#: src/gui/setup_audio.cpp:87
msgid "stereo"
-msgstr ""
+msgstr "estereo"
#: src/gui/setup_audio.cpp:88
msgid "surround"
-msgstr ""
+msgstr "surrond"
#: src/gui/setup_audio.cpp:89
msgid "surround+center+lfe"
-msgstr ""
+msgstr "surrond+center+lfe"
#: src/gui/setup_audio.cpp:90
msgid "Audio channels"
-msgstr ""
+msgstr "Canais de Áudio"
#: src/gui/setup_audio.cpp:94
msgid "Sound effects"
@@ -2619,17 +2625,17 @@ msgstr "Retirar"
#: src/gui/setup_input.cpp:132
msgid "Reset all keys"
-msgstr ""
+msgstr "Resetar todas teclas"
#: src/gui/setup_input.cpp:135
msgid "Default"
msgstr "Padrão"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Conflitos de teclas detectado."
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2638,9 +2644,9 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
msgid "Press the button to start calibration"
@@ -2752,7 +2758,7 @@ msgstr "Atacar enquanto se move"
#: src/gui/setup_other.cpp:104
msgid "Attack next target"
-msgstr ""
+msgstr "Atacar próximo ao alvo"
#: src/gui/setup_other.cpp:107
msgid "Sync player move"
@@ -2800,7 +2806,7 @@ msgstr "Habilitar filtro de ataque"
#: src/gui/setup_other.cpp:140
msgid "Enable pickup filter"
-msgstr ""
+msgstr "Habilitar filtro de captura"
#: src/gui/setup_other.cpp:143
msgid "Enable advert protocol"
@@ -2832,15 +2838,15 @@ msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
#: src/gui/setup_other.cpp:172
msgid "Keyboard"
-msgstr ""
+msgstr "Teclado"
#: src/gui/setup_other.cpp:174
msgid "Repeat delay"
-msgstr ""
+msgstr "Atraso de repetição"
#: src/gui/setup_other.cpp:177
msgid "Repeat interval"
-msgstr ""
+msgstr "Intervalo de repetição"
#: src/gui/setup_other.cpp:184
msgid "Always show"
@@ -2912,7 +2918,7 @@ msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
#: src/gui/setup_other.cpp:235
msgid "Network delay between sub servers"
-msgstr ""
+msgstr "Atraso de rede entre sub servidores"
#: src/gui/setup_other.cpp:238
msgid "Show background"
@@ -2941,11 +2947,11 @@ msgstr "Habilitar redução de mapa (Software)"
#: src/gui/setup_perfomance.cpp:69
msgid "Enable compound sprite delay (Software)"
-msgstr ""
+msgstr "Habilitar atraso composto de sprite (Software)"
#: src/gui/setup_perfomance.cpp:72
msgid "Enable delayed images load (OpenGL)"
-msgstr ""
+msgstr "Habilitar atrasos de carregamento de imagens (OpenGL) "
#: src/gui/setup_perfomance.cpp:75
msgid "Better quality (disable for better perfomance)"
@@ -2978,18 +2984,19 @@ msgstr "Desabilitar cache (Software)"
#: src/gui/setup_perfomance.cpp:99
msgid "Different options (enable or disable can improve perfomance)"
msgstr ""
+"Opções diferentes (habilitar ou desabilitar pode melhorar a performance)"
#: src/gui/setup_perfomance.cpp:102
msgid "Enable texture compression (fast OpenGL)"
-msgstr ""
+msgstr "Habilitar a compreensão de texturas (OpenGL rápido)"
#: src/gui/setup_perfomance.cpp:105
msgid "Enable rectangular texture extension (OpenGL)"
-msgstr ""
+msgstr "Habilitar extensão de texturas retangulares (OpenGL)"
#: src/gui/setup_perfomance.cpp:108
msgid "Use new texture internal format (OpenGL)"
-msgstr ""
+msgstr "Usar nova textura de formato interno (OpenGL)"
#: src/gui/setup_players.cpp:53
msgid "Show gender"
@@ -3041,7 +3048,7 @@ msgstr "Grupo de amigos que está na janela on-line"
#: src/gui/setup_players.cpp:89
msgid "Hide erased players nicks"
-msgstr ""
+msgstr "Esconder nicks de jogadores apagados"
#: src/gui/setup_relations.cpp:63
msgid "Relation"
@@ -3091,131 +3098,162 @@ msgstr "Relações"
msgid "When ignoring:"
msgstr "Quando ignorar:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Minúsculo (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Pequeno (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Médio (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Normal"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Largo (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Largo (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Grande (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
+msgstr "Enorme (15)"
+
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
msgstr "Enorme (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Chinês(China)"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Tcheco"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Inglês"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Finlandês"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Francês"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Alemão"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Indonésio"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Polonês"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Japonês"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Holandês"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Português"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Português (Brasileiro)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Russo"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Espanhol"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Tema"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Linguagem"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Fonte"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Fonte negrito"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Fonte de particulas"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Fonte de ajuda"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Fonte segura"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Fontes japonesas"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Tamanho da fonte"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Tamanho da fonte"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Tema alterado"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -3259,7 +3297,7 @@ msgstr "Limite de FPS alternativo: "
#: src/gui/setup_video.cpp:244
msgid "Detect best mode"
-msgstr ""
+msgstr "Detectar melhor modo"
#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
@@ -3399,19 +3437,19 @@ msgstr "Detalhe de partículas"
#: src/gui/setup_visual.cpp:90
msgid "best quality"
-msgstr ""
+msgstr "Melhor qualidade"
#: src/gui/setup_visual.cpp:91
msgid "normal"
-msgstr ""
+msgstr "normal"
#: src/gui/setup_visual.cpp:92
msgid "best perfomance"
-msgstr ""
+msgstr "Melhor performace"
#: src/gui/setup_visual.cpp:93
msgid "Particle physics"
-msgstr ""
+msgstr "Física de partículas"
#: src/gui/setup_visual.cpp:98
msgid "Gamma"
@@ -3427,7 +3465,7 @@ msgstr "Vsync"
#: src/gui/setup_visual.cpp:109
msgid "Center game window"
-msgstr ""
+msgstr "Centro da janela de jogo"
#: src/gui/shopwindow.cpp:76
msgid "Personal Shop"
@@ -3454,7 +3492,6 @@ msgid "Auction"
msgstr "Leilão"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Proposta de negociação"
@@ -3599,15 +3636,15 @@ msgstr "Ignorar mobs"
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
#: src/gui/socialwindow.cpp:984
msgid "Pik"
-msgstr ""
+msgstr "Pik"
#: src/gui/socialwindow.cpp:1008
msgid "Pickup items"
-msgstr ""
+msgstr "Pegar itens"
#: src/gui/socialwindow.cpp:1009
msgid "Ignore items"
-msgstr ""
+msgstr "Ignorar itens"
#: src/gui/socialwindow.cpp:1132
msgid "Create Guild"
@@ -4064,7 +4101,7 @@ msgstr "Destaque de colisão de água"
#: src/gui/userpalette.cpp:158
msgid "Special ground collision Highlight"
-msgstr ""
+msgstr "Destaque especial colisão de chão"
#: src/gui/userpalette.cpp:160
msgid "Walkable Highlight"
@@ -4375,7 +4412,7 @@ msgstr "Trocar Login"
msgid "Choose World"
msgstr "Escolher Mundo"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "tecla_%d"
@@ -4394,10 +4431,10 @@ msgstr "Tecla desconhecida"
#: src/inputmanager.cpp:351
#, c-format
msgid "JB%d"
-msgstr ""
+msgstr "JB%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "tecla u"
@@ -4744,7 +4781,7 @@ msgstr "Imitando:"
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Você vê "
@@ -4920,7 +4957,7 @@ msgstr "Slot incorreto."
msgid "Incorrect race."
msgstr "Corrida incorreta."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Informações"
@@ -4986,7 +5023,7 @@ msgstr "Jogo"
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Guilda criada."
@@ -5204,7 +5241,7 @@ msgstr "Impossível equipar."
msgid "Account was not found. Please re-login."
msgstr "Conta não encontrada. Por favor, tente novamente."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Senha antiga incorreta."
@@ -5213,9 +5250,6 @@ msgid "New password too short."
msgstr "Nova senha é muito curta."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Erro desconhecido."
@@ -5319,23 +5353,23 @@ msgstr "%s saiu do seu grupo."
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Você está morto."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "Lamentamos informar que seu personagem foi morto(a) em combate."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Você não me parece assim tão vivo."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "As mãos frias da morte estão levando sua alma."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Fim de jogo!"
@@ -5343,7 +5377,7 @@ msgstr "Fim de jogo!"
msgid "Insert coin to continue."
msgstr "Insira uma moeda para continuar."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5351,34 +5385,34 @@ msgstr ""
"Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
"um lugar melhor."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
"Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Eu acho que as coisas não correram tão bem."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Você quer uma identificação de suas posses?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Infelizmente, seus traços nunca foram encontrados..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Aniquilado."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Parece que te ofereceram sua própria cabeça."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
@@ -5555,495 +5589,231 @@ msgstr "Não foi possível roubar nada..."
msgid "Poison had no effect..."
msgstr "Veneno não surtiu efeito..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quer negociar com você, você aceita?"
-
-#: src/net/ea/tradehandler.cpp:135
-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:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Negociação impossível. O personagem não existe."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Negociação cancelada devido a uma razão desconhecida."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Negociação: Você e %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Negociação com %s cancelada."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Troca injusta pacote cancelado."
-
-#: src/net/ea/tradehandler.cpp:237
-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:242
-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:247
-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:251
-msgid "Failed adding item for unknown reason."
-msgstr "Erro ao adicionar item devido a um motivo desconhecido."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Negociação cancelada."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Negociação realizada."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Força"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Força %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Agilidade"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Agilidade %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Destreza"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Destreza %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Vitalidade"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Vitalidade %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Inteligência"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Intelegência %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Força de Vontade"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Força de Vontade %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Clique em OK para repopular."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Você morreu"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Não está conectado."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Sem espaço"
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Nome inválido."
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Nome de usuário já existe."
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Estilo inválido."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Cor inválida."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Gênero inválido."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Atributos do personagem estão muito altos."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Atributos do personagem estão muito baixos."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr "Seu estatus está longe do permitido (%u - %u)"
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Número de slot inválido."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Personagem deletado."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Seleção fora de alcançe."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Erro desconhecido (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Não há servidores disponíveis."
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Jogadores neste canal:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Erro ao entrar no canal."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Listando canais."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Fim da lista de canais."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s entrou no canal."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s saiu do canal."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s colocou o modo %s no usuário %s."
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s expulsou %s."
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Evento de canal desconhecido."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Erro ao criar Guilda."
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Convite enviado."
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Membro foi promovido com sucesso."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Erro ao promover o membro."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Token-mágico errado."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Já está conectado."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Conta banida."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Nova senha incorreta."
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Conta não conectada. Por favor, efetue o login primeiro."
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Novo endereço de email incorreto."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Antigo endereço de email incorreto."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "O novo endereço de email já existe."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Registro pelo cliente não é permitido. Favor contactar o administrador do "
-"servidor."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Versão do cliente é muito antiga."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Nome de usuário ou senha inválidos."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Conta banida"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "Tentativa de login muito próxima da última tentativa."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Nome de usuário, senha ou email inválidos."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Nome de usuário já existe."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Endereço de email já existe."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Você demorou demais no Captcha ou sua resposta foi incorreta."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s entrou para o grupo."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s recusou seu convite."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Aceitando propostas de negócios."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorando propostas de negócios."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Negociando com %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Erro na expulsão!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Expulsão bem sucedida!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Obrigado pela venda."
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Impossibilitado de vender."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Não se pode vender durante uma negociação."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Não se pode vender este item."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Força %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilidade %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalidade %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligência %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destreza %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Sorte %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Falha de autenticação."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Servidores indisponíveis."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Outra pessoa está tentando utilizar esta conta."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Existe alguém conectado a esta conta."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Login duplicado."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Erro de conexão desconhecido."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Você foi desconectado(a) do servidor!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Sorte"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Defesa"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "Atq. Mágico"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "Def. Mágica"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Exatidão"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Evasão"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Críticos"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Atraso de ataque"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Atraso de movimento"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Atraso de alcance"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Dano por seg."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Endereço vazio enviado para Network::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Não foi possível determinar o host \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Conexão com o servidor interrompida. "
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quer negociar com você, você aceita?"
+
+#: src/net/ea/tradehandler.cpp:135
+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:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Negociação impossível. O personagem não existe."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Negociação cancelada devido a uma razão desconhecida."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Negociação: Você e %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Negociação com %s cancelada."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Troca injusta pacote cancelado."
+
+#: src/net/ea/tradehandler.cpp:237
+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:242
+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:247
+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:251
+msgid "Failed adding item for unknown reason."
+msgstr "Erro ao adicionar item devido a um motivo desconhecido."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Negociação cancelada."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Negociação realizada."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Imprimir '...'"
@@ -6088,3 +5858,195 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Item desconhecido"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Não foi possível carregar o mapa"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Erro ao carregar %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Força %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Agilidade %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Destreza %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Vitalidade %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Intelegência %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Força de Vontade"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Força de Vontade %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Clique em OK para repopular."
+
+#~ msgid "You Died"
+#~ msgstr "Você morreu"
+
+#~ msgid "Not logged in."
+#~ msgstr "Não está conectado."
+
+#~ msgid "No empty slot."
+#~ msgstr "Sem espaço"
+
+#~ msgid "Invalid name."
+#~ msgstr "Nome inválido."
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Nome de usuário já existe."
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Estilo inválido."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Cor inválida."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Gênero inválido."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Atributos do personagem estão muito altos."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Atributos do personagem estão muito baixos."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr "Seu estatus está longe do permitido (%u - %u)"
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Número de slot inválido."
+
+#~ msgid "Player deleted."
+#~ msgstr "Personagem deletado."
+
+#~ msgid "Selection out of range."
+#~ msgstr "Seleção fora de alcançe."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Erro desconhecido (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Não há servidores disponíveis."
+
+#~ msgid "Topic: %s"
+#~ msgstr "Tópico: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Jogadores neste canal:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Erro ao entrar no canal."
+
+#~ msgid "Listing channels."
+#~ msgstr "Listando canais."
+
+#~ msgid "End of channel list."
+#~ msgstr "Fim da lista de canais."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s entrou no canal."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s saiu do canal."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s colocou o modo %s no usuário %s."
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s expulsou %s."
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Evento de canal desconhecido."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Erro ao criar Guilda."
+
+#~ msgid "Invite sent."
+#~ msgstr "Convite enviado."
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Membro foi promovido com sucesso."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Erro ao promover o membro."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Token-mágico errado."
+
+#~ msgid "Already logged in."
+#~ msgstr "Já está conectado."
+
+#~ msgid "Account banned."
+#~ msgstr "Conta banida."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Nova senha incorreta."
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Conta não conectada. Por favor, efetue o login primeiro."
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Novo endereço de email incorreto."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Antigo endereço de email incorreto."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "O novo endereço de email já existe."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Registro pelo cliente não é permitido. Favor contactar o administrador do "
+#~ "servidor."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Versão do cliente é muito antiga."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Nome de usuário ou senha inválidos."
+
+#~ msgid "Account banned"
+#~ msgstr "Conta banida"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "Tentativa de login muito próxima da última tentativa."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Nome de usuário, senha ou email inválidos."
+
+#~ msgid "Username already exists."
+#~ msgstr "Nome de usuário já existe."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Endereço de email já existe."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "Você demorou demais no Captcha ou sua resposta foi incorreta."
+
+#~ msgid "Joined party."
+#~ msgstr "Entrou para o grupo."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s entrou para o grupo."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s recusou seu convite."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Aceitando propostas de negócios."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Ignorando propostas de negócios."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Negociando com %s"
diff --git a/po/ru.po b/po/ru.po
index 443a594fd..dcd9000b3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:36+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
@@ -57,113 +57,112 @@ msgstr "О"
msgid "I"
msgstr "Б"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "Производительность"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "Видео"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "Темы"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "Неизвестная команда."
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "Нельзя отправлять пустые сообщения!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -172,105 +171,105 @@ msgstr ""
"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
"уже создана, или этот игрок Вы сами."
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "Не указано название группы"
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "Не задано имя гильдии."
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "Пожалуйста, укажите имя"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr "Enter переключает Вас на окно чата."
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "Сообщение закрывает чат."
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "Теперь Return переключает чат."
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "Теперь сообщение закрывает чат."
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "друг"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "пренебрегаемый"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "нейтральный"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируется!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из списка игнорирования!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr "добавлен в черный список"
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr "враг"
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "Игрок удален!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -278,7 +277,7 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -286,7 +285,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -294,7 +293,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -302,7 +301,7 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -310,27 +309,27 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "размер кеша шрифта"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr "Размер кеша:"
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "Создано:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "Удалено:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr "Изображений:"
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
@@ -341,39 +340,30 @@ msgstr ""
"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
"\"0\"."
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "Общие"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "Отладка"
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "Снимок экрана сохранен как "
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "Ошибка сети"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "Не удалось загрузить карту"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "Ошибка во время загрузки %s"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -404,7 +394,8 @@ msgstr "Имя"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "Атака"
@@ -424,13 +415,13 @@ msgstr "Движение"
msgid "Result"
msgstr "Результат"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "Сбросить"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "Купить"
@@ -447,7 +438,7 @@ msgstr "Количество:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -455,14 +446,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "Выход"
@@ -479,25 +470,25 @@ msgid "Shop"
msgstr "Магазин"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Продать"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -568,7 +559,7 @@ msgstr "Новый пароль не совпадает."
msgid "New Character"
msgstr "Новый персонаж"
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "Имя:"
@@ -679,7 +670,7 @@ msgstr "Введите пароль для удаления персонажа"
msgid "Enter password:"
msgstr "Введите пароль:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -759,7 +750,7 @@ msgstr "радуга 3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -789,9 +780,9 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "Игнорировать"
@@ -955,7 +946,7 @@ msgid "Did You Know?"
msgstr "Вы знаете?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "Закрыть"
@@ -972,33 +963,33 @@ msgstr "Следующий >"
msgid "Auto open this window"
msgstr "Автоматически открывать это окно"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "ОК"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr "Редактирование сервера"
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr "Адрес:"
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "Порт:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "Тип:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr "Описание:"
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr "Пожалуйста введите хотябы адрес и порт сервера"
@@ -1007,8 +998,8 @@ msgid "Equipment"
msgstr "Снаряжение"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "Снять"
@@ -1050,26 +1041,26 @@ msgid "Filter:"
msgstr "Фильтр:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "Надеть"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "Использовать"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "Разделить"
@@ -1083,17 +1074,17 @@ msgid "Weight:"
msgstr "Вес:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "Бросить"
@@ -1331,24 +1322,24 @@ msgstr "статус"
msgid "Need"
msgstr "Нужно"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr "Остановить ожидание"
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "Следующий"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "Применить"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "Очистить"
@@ -1420,7 +1411,7 @@ msgid "Nuke"
msgstr "Уничтожить"
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "Добавить коментарий"
@@ -1440,7 +1431,7 @@ msgstr "Добавить в приоритетный список"
msgid "Add to attack list"
msgstr "Добавить в список атаки"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
@@ -1453,7 +1444,7 @@ msgid "Players"
msgstr "Игроки"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "Выкинуть из группы"
@@ -1461,8 +1452,8 @@ msgstr "Выкинуть из группы"
msgid "Pick up"
msgstr "Поднять"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "Добавить в чат"
@@ -1474,8 +1465,8 @@ msgstr "Элмент карты"
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr "Удалить"
@@ -1531,7 +1522,7 @@ msgstr "Покинуть"
msgid "Copy to clipboard"
msgstr "Копировать в буфер обмена"
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr "Пригласить в группу"
@@ -1540,170 +1531,185 @@ msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "Имя: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "Комментарий "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "Комментарий: "
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr "Добавить к сделке"
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "Добавить к торговле все"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "Сохранить все"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "Бросить все"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "Получить все"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr "Очистить окно дропов"
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr "Скопировать в чат"
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr "Передвинуть ниже"
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr "Раздеть"
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "Подружиться"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr "Пренебречь"
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr "Черный список"
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr "Сделать врагом"
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr "Стереть"
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr "Не игнорировать"
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "Следовать"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr "Имитировать"
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "Купить (?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "Продать (?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "Показать предметы"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr "Удалить из поднятия"
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr "Сделать поднимаемым"
@@ -1747,58 +1753,58 @@ msgstr "Пароль не должен содержать более %d симв
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "Выберите сервер"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Выбор сервера *** БЕЗОПАСНЫЙ РЕЖИМ ***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "Использовать одинаковый IP для игровых суб-серверов"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "Загрузить"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "Соединиться"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "Добавить"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "Изменить"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Получение списка серверов...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "Ожидание ответа от сервера"
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "Подготовка к загрузке"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "Не удалось получить список серверов!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "требуется более новая версия"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "требуется v%s"
@@ -2632,11 +2638,11 @@ msgstr "Сбросить все кнопки"
msgid "Default"
msgstr "По умолчанию"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2645,7 +2651,7 @@ msgstr ""
"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
"вести."
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr "неизвестно"
@@ -3103,131 +3109,162 @@ msgstr "Связи"
msgid "When ignoring:"
msgstr "Когда игнорируется:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "Маленький (10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "Маленький (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "Средний (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "Нормально"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "Большой (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "Большой (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "Боьшой (14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
msgstr "Огромный (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
+msgstr "Огромный (15)"
+
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr "Китайский"
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr "Чешский"
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr "Английский"
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr "Финский"
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr "Французский"
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr "Немецкий"
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr "Индонезийский"
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr "Польский"
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr "Японский"
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr "Голландский (Бельгийский / Фламандский)"
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr "Португальский"
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr "Португальский (Бразильский)"
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr "Русский"
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr "Испанский (Кастильский)"
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "Тема"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "Тема интерфейса"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr "Язык"
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "Основной шрифт"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "Жирный шрифт"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "Шрифт частиц"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "Шрифт помощи"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "Безопасный шрифт"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "Японский шрифт"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "Размер шрифта"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "Размер шрифта"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "Тема изменена"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "Перезегрузите игру дабы изменения вступили в силу."
@@ -3468,7 +3505,6 @@ msgid "Auction"
msgstr "Аукцион"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Запрос на Торговлю"
@@ -4391,7 +4427,7 @@ msgstr "Сменить логин"
msgid "Choose World"
msgstr "Выберите сервер"
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr "кнопка_%d"
@@ -4413,7 +4449,7 @@ msgid "JB%d"
msgstr "ДЖ%d"
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr "неиз."
@@ -4761,7 +4797,7 @@ msgstr "Имитация: "
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "Вы видите "
@@ -4936,7 +4972,7 @@ msgstr "Некорректный слот."
msgid "Incorrect race."
msgstr "Неправильная расса."
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "Сведения"
@@ -5002,7 +5038,7 @@ msgstr "Игра"
msgid "Request to quit denied!"
msgstr "Запрос на выход отклонен!"
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "Гильдия создана."
@@ -5218,7 +5254,7 @@ msgstr "Нельзя экипировать!"
msgid "Account was not found. Please re-login."
msgstr "Учетная запись не найдена. Попробуйте снова."
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "Старый пароль указан неверно."
@@ -5227,9 +5263,6 @@ msgid "New password too short."
msgstr "Новый пароль слишком короткий."
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "Неизвестная ошибка."
@@ -5330,23 +5363,23 @@ msgstr "%s покинул Вашу группу."
msgid "An unknown member tried to say: %s"
msgstr "Неизвестный участник попытался сказать: %s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "Вы мертвы."
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "С грустью сообщаем вам, что Ваш персонаж пал в бою."
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "Вас больше нет среди живых."
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "Холодные руки Смерти извлекают Вашу душу."
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "Игра Окончена!"
@@ -5354,7 +5387,7 @@ msgstr "Игра Окончена!"
msgid "Insert coin to continue."
msgstr "Опустите монетку для продолжения."
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
@@ -5362,33 +5395,33 @@ msgstr ""
"Нет, детки. Ваш персонаж на самом деле не умер. Он...эммм...ушел в лучший "
"мир."
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr "Ваш план сломать оружие врагов о свое горло провалился."
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "Похоже, это было не слишком хорошо."
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr "Хочешь, предскажу твою судьбу?"
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr "Грустно, Вас вряд ли когда-нибудь найдут..."
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "Уничтожен."
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr "Похоже, Вам отдали Вашу голову."
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr "Вы опять пролетели, выбросите своё тело в трубу, и получите другое."
@@ -5565,499 +5598,231 @@ msgstr "Не удалось ничего украсть..."
msgid "Poison had no effect..."
msgstr "Яд не подействовал..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Торговля невозможна. Партнер по торговле слишком далеко."
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Торговля невозможна. Такой персонаж не существует."
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Торговля отменена по неизвестной причине."
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Торговля: Вы и %s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Торговля с %s отменена."
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "Неизвестный сигнал завершения торговли."
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr "Не удалось добавить предмет по неизвестной причине."
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "Торговля отменена."
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "Торговля завершена."
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "Сила (str)"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "Сила (str) %+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "Выносливость (agi)"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "Выносливость (agi) %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "Ловкость (dex)"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "Ловкость (dex) %+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "Живучесть (vit)"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "Живучесть (vit) %+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "Интеллект (int)"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "Интеллект (int) %+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "Воля"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "Воля (wil) %+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "Нажмите ОК, чтобы возродиться."
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "Вы умерли"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "Не авторизован."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "Нет свободного места."
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "Имя задано неверно"
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "Персонаж с таким именем уже существует"
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "Прическа выбрана неверно."
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "Цвет волос выбран неверно."
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "Пол выбран неверно."
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "Характеристики персонажа слишком велики."
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "Характеристики персонажа слишком малы."
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-"Как минимум один статистический модификатор вне разрешённого диапазона: (%u "
-"- %u)."
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr "Некорректный номер слота."
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "Игрок удален."
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "Выбор вне допустимого предела."
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Неизвестная ошибка (%d)."
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "Доступные игровые серверы не найдены"
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "Тема: %s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "Игроки на канале:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Ошибка подключения к каналу."
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Список каналов."
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Конец списка каналов."
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s зашел на канал."
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr "%s покинул канал."
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s установил режим %s для пользователя %s"
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s был вышвырнут %s"
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr "Неизвестное событие на канале."
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "Ошибка создания гильдии"
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "Приглашение отправлено"
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "Член гильдии успешно повышен."
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "Не удалось повысить члена гильдии."
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "Ошибочный magic_token."
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "Уже в сети."
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "Учетная запись заблокирована (бан)."
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "Новый пароль указан неверно"
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "Вы не вошли под своим именем. Пожалуйста, авторизуйтесь"
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "Новый адрес E-mail указан неверно."
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "Старый адрес E-mail указан неверно."
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "Введенный адрес E-mail уже зарегистрирован."
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-"Регистрация из клиента запрещена. Пожалуйста, свяжитесь с администрацией "
-"сервера."
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "Версия клиент-программы устарела."
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "Неверное имя пользователя или пароль."
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "Учетная запись заблокирована (бан)."
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-"С вашей предыдущей попытки авторизации прошло слишком мало времени, "
-"попробуйте позже."
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "Неверное имя пользователя, пароль или адрес E-mail."
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "Пользователь с таким именем уже существует."
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "Введенный адрес E-mail уже зарегистрирован."
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Вы слишко долго проходили проверку или ваш ответ неверный."
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "Присоединился к группе."
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s теперь в группе."
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s Отклоняет Ваше приглашение."
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "Принимать входящие предложения торговли."
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "Игнорировать входящие предложения торговли."
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "Торговля с %s"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "Не удалось вышвырнуть!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "Игрок вышвырнут!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "Спасибо за продажу!"
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "Нельзя продать."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "Невозможно продавать в режиме обмена."
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr "Невозможно продать непродаваемый предмет."
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Сила (str) %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Выносливость (agi) %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Живучесть (vit) %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Интеллект (int) %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Ловкость (dex) %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Удача (luk) %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Ошибка авторизации."
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Нет доступных серверов."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "Этот аккаунт уже в сети."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "Обнаружен взлом скорости."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "Двойная попытка подключения."
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "Неизвестная ошибка подключения."
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "Отключено от сервера!"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "Сила (str)"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "Выносливость (agi)"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "Живучесть (vit)"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "Интеллект (int)"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "Ловкость (dex)"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "Удача (luk)"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "Защита"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr "Маг. Атака"
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr "Маг.Защита"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "% Точности"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "% Уклонения"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "% Критический удар"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "Задержка атаки"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "Задержка движения"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "Зона атаки"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "Урон в сек."
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "Пустой адрес был передан методу Network::connect()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "Не удалось найти хост \""
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "Подключение к серверу прервано."
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s не в группе!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Торговля невозможна. Партнер по торговле слишком далеко."
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Торговля невозможна. Такой персонаж не существует."
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Торговля отменена по неизвестной причине."
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Торговля: Вы и %s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Торговля с %s отменена."
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "Неизвестный сигнал завершения торговли."
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr "Не удалось добавить предмет по неизвестной причине."
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "Торговля отменена."
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "Торговля завершена."
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr "Печатать '...'"
@@ -6102,3 +5867,199 @@ msgstr "Мана %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Неизвестный предмет"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "Не удалось загрузить карту"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "Ошибка во время загрузки %s"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "Сила (str) %+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "Выносливость (agi) %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "Ловкость (dex) %+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "Живучесть (vit) %+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "Интеллект (int) %+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "Воля"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "Воля (wil) %+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "Нажмите ОК, чтобы возродиться."
+
+#~ msgid "You Died"
+#~ msgstr "Вы умерли"
+
+#~ msgid "Not logged in."
+#~ msgstr "Не авторизован."
+
+#~ msgid "No empty slot."
+#~ msgstr "Нет свободного места."
+
+#~ msgid "Invalid name."
+#~ msgstr "Имя задано неверно"
+
+#~ msgid "Character's name already exists."
+#~ msgstr "Персонаж с таким именем уже существует"
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "Прическа выбрана неверно."
+
+#~ msgid "Invalid hair color."
+#~ msgstr "Цвет волос выбран неверно."
+
+#~ msgid "Invalid gender."
+#~ msgstr "Пол выбран неверно."
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "Характеристики персонажа слишком велики."
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "Характеристики персонажа слишком малы."
+
+#~ msgid "At least one stat is out of the permitted range: (%u - %u)."
+#~ msgstr ""
+#~ "Как минимум один статистический модификатор вне разрешённого диапазона: "
+#~ "(%u - %u)."
+
+#~ msgid "Invalid slot number."
+#~ msgstr "Некорректный номер слота."
+
+#~ msgid "Player deleted."
+#~ msgstr "Игрок удален."
+
+#~ msgid "Selection out of range."
+#~ msgstr "Выбор вне допустимого предела."
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "Неизвестная ошибка (%d)."
+
+#~ msgid "No gameservers are available."
+#~ msgstr "Доступные игровые серверы не найдены"
+
+#~ msgid "Topic: %s"
+#~ msgstr "Тема: %s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "Игроки на канале:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "Ошибка подключения к каналу."
+
+#~ msgid "Listing channels."
+#~ msgstr "Список каналов."
+
+#~ msgid "End of channel list."
+#~ msgstr "Конец списка каналов."
+
+#~ msgid "%s entered the channel."
+#~ msgstr "%s зашел на канал."
+
+#~ msgid "%s left the channel."
+#~ msgstr "%s покинул канал."
+
+#~ msgid "%s has set mode %s on user %s."
+#~ msgstr "%s установил режим %s для пользователя %s"
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s был вышвырнут %s"
+
+#~ msgid "Unknown channel event."
+#~ msgstr "Неизвестное событие на канале."
+
+#~ msgid "Error creating guild."
+#~ msgstr "Ошибка создания гильдии"
+
+#~ msgid "Invite sent."
+#~ msgstr "Приглашение отправлено"
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "Член гильдии успешно повышен."
+
+#~ msgid "Failed to promote member."
+#~ msgstr "Не удалось повысить члена гильдии."
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "Ошибочный magic_token."
+
+#~ msgid "Already logged in."
+#~ msgstr "Уже в сети."
+
+#~ msgid "Account banned."
+#~ msgstr "Учетная запись заблокирована (бан)."
+
+#~ msgid "New password incorrect."
+#~ msgstr "Новый пароль указан неверно"
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "Вы не вошли под своим именем. Пожалуйста, авторизуйтесь"
+
+#~ msgid "New email address incorrect."
+#~ msgstr "Новый адрес E-mail указан неверно."
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "Старый адрес E-mail указан неверно."
+
+#~ msgid "The new email address already exists."
+#~ msgstr "Введенный адрес E-mail уже зарегистрирован."
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr ""
+#~ "Регистрация из клиента запрещена. Пожалуйста, свяжитесь с администрацией "
+#~ "сервера."
+
+#~ msgid "Client version is too old."
+#~ msgstr "Версия клиент-программы устарела."
+
+#~ msgid "Wrong username or password."
+#~ msgstr "Неверное имя пользователя или пароль."
+
+#~ msgid "Account banned"
+#~ msgstr "Учетная запись заблокирована (бан)."
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr ""
+#~ "С вашей предыдущей попытки авторизации прошло слишком мало времени, "
+#~ "попробуйте позже."
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "Неверное имя пользователя, пароль или адрес E-mail."
+
+#~ msgid "Username already exists."
+#~ msgstr "Пользователь с таким именем уже существует."
+
+#~ msgid "Email address already exists."
+#~ msgstr "Введенный адрес E-mail уже зарегистрирован."
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "Вы слишко долго проходили проверку или ваш ответ неверный."
+
+#~ msgid "Joined party."
+#~ msgstr "Присоединился к группе."
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s теперь в группе."
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s Отклоняет Ваше приглашение."
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "Принимать входящие предложения торговли."
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "Игнорировать входящие предложения торговли."
+
+#~ msgid "Trading with %s"
+#~ msgstr "Торговля с %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 412e4929f..4e80799cc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-06-23 16:53+0300\n"
+"POT-Creation-Date: 2012-07-01 02:32+0300\n"
"PO-Revision-Date: 2012-06-21 20:34+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -55,268 +55,267 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:977 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:984 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
msgid "Setup"
msgstr "魔法攻击"
-#: src/client.cpp:984 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:991 src/gui/setup_perfomance.cpp:47
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:989 src/gui/setup_video.cpp:250
+#: src/client.cpp:996 src/gui/setup_video.cpp:250
msgid "Video"
msgstr "视频"
-#: src/client.cpp:994
+#: src/client.cpp:1001
msgid "Themes"
msgstr "主题"
-#: src/client.cpp:1080
+#: src/client.cpp:1087
msgid "Connecting to server"
msgstr "魔法防御"
-#: src/client.cpp:1118
+#: src/client.cpp:1125
msgid "Logging in"
msgstr "尝试捡起不存在的物品。"
-#: src/client.cpp:1152
+#: src/client.cpp:1159
msgid "Entering game world"
msgstr "捡起物品发生不存在的物品。"
-#: src/client.cpp:1258
+#: src/client.cpp:1265
msgid "Requesting characters"
msgstr "请求角色"
-#: src/client.cpp:1293
+#: src/client.cpp:1300
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1303
+#: src/client.cpp:1310
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1346 src/client.cpp:1354 src/client.cpp:1489
+#: src/client.cpp:1353 src/client.cpp:1361 src/client.cpp:1496
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:186
-#: src/net/manaserv/charhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:188
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1364
+#: src/client.cpp:1371
msgid "Requesting registration details"
msgstr "请求注册的详细信息"
-#: src/client.cpp:1390
+#: src/client.cpp:1397
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1391
+#: src/client.cpp:1398
msgid "Password changed successfully!"
msgstr "更改密码成功!"
-#: src/client.cpp:1410
+#: src/client.cpp:1417
msgid "Email Change"
msgstr "更改电子邮件"
-#: src/client.cpp:1411
+#: src/client.cpp:1418
msgid "Email changed successfully!"
msgstr "更改电子邮件成功!"
-#: src/client.cpp:1431
+#: src/client.cpp:1438
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1432
+#: src/client.cpp:1439
msgid "Farewell, come back any time..."
msgstr "再见,随时欢迎回来... ..."
-#: src/client.cpp:1655 src/client.cpp:1688 src/client.cpp:1703
-#: src/client.cpp:2148 src/client.cpp:2155
+#: src/client.cpp:1662 src/client.cpp:1695 src/client.cpp:1710
+#: src/client.cpp:2155 src/client.cpp:2162
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s 不存在,并且无法创建!退出。"
-#: src/client.cpp:1846
+#: src/client.cpp:1853
#, c-format
msgid "Invalid update host: %s"
msgstr "无效的更新主机: %s"
-#: src/client.cpp:1880 src/client.cpp:1886
+#: src/client.cpp:1887 src/client.cpp:1893
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1907
+#: src/client.cpp:1914
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s 不存在并且无法创建!退出。"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
msgid "Unknown command."
msgstr "未知命令。"
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:344
msgid "Cannot send empty whispers!"
msgstr "无法发送空白密语!"
-#: src/commandhandler.cpp:357
+#: src/commandhandler.cpp:358
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr "无法同 \"%s\" 建立一个私人谈话标签页!或者已经存在,或者那就是自己。"
-#: src/commandhandler.cpp:377
+#: src/commandhandler.cpp:378
#, c-format
msgid "Requesting to join channel %s."
msgstr "请求加入频道%s。"
-#: src/commandhandler.cpp:393 src/net/ea/gui/partytab.cpp:126
+#: src/commandhandler.cpp:394 src/net/ea/gui/partytab.cpp:126
msgid "Party name is missing."
msgstr "帮会名称缺失。"
-#: src/commandhandler.cpp:404
+#: src/commandhandler.cpp:405
msgid "Guild name is missing."
msgstr "公会名称是缺少的。"
-#: src/commandhandler.cpp:417 src/commandhandler.cpp:534
-#: src/commandhandler.cpp:575 src/commandhandler.cpp:615
+#: src/commandhandler.cpp:418 src/commandhandler.cpp:535
+#: src/commandhandler.cpp:576 src/commandhandler.cpp:616
msgid "Please specify a name."
msgstr "请指定一个名称。"
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
msgid "Message closes chat."
msgstr "讯息关闭聊天。"
-#: src/commandhandler.cpp:479
+#: src/commandhandler.cpp:480
msgid "Return now toggles chat."
msgstr "<回车>键现在切换聊天。"
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:486
msgid "Message now closes chat."
msgstr "讯息现在关闭聊天。"
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:514
msgid "friend"
msgstr "朋友"
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:519
msgid "disregarded"
msgstr "无视"
-#: src/commandhandler.cpp:523
+#: src/commandhandler.cpp:524
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:542
+#: src/commandhandler.cpp:543
#, c-format
msgid "Player already %s!"
msgstr "玩家已经%s!"
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:557
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:565
#, c-format
msgid "Player could not be %s!"
msgstr "玩家不能为 %s"
-#: src/commandhandler.cpp:587
+#: src/commandhandler.cpp:588
msgid "Player wasn't ignored!"
msgstr "是不能忽视的!"
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:595
msgid "Player no longer ignored!"
msgstr "玩家不再被忽略!"
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
msgid "Player could not be unignored!"
msgstr "玩家不能被忽略!"
-#: src/commandhandler.cpp:602
+#: src/commandhandler.cpp:603
msgid "blacklisted"
msgstr ""
-#: src/commandhandler.cpp:607
+#: src/commandhandler.cpp:608
msgid "enemy"
msgstr ""
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
msgid "Player already erased!"
msgstr "玩家已经被删除!"
-#: src/commandhandler.cpp:633
+#: src/commandhandler.cpp:634
msgid "Player successfully erased!"
msgstr "玩家成功删除!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:636
msgid "Player could not be erased!"
msgstr "玩家无法删除!"
-#: src/commandhandler.cpp:948 src/commandhandler.cpp:994
+#: src/commandhandler.cpp:949 src/commandhandler.cpp:995
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:959
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:967
+#: src/commandhandler.cpp:968
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:975
+#: src/commandhandler.cpp:976
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:983
+#: src/commandhandler.cpp:984
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:992
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
msgid "font cache size"
msgstr "字体缓存大小"
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1083
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1086
+#: src/commandhandler.cpp:1087
msgid "Created:"
msgstr "创建于:"
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1089
msgid "Deleted:"
msgstr "删除:"
-#: src/commandhandler.cpp:1261 src/commandhandler.cpp:1268
+#: src/commandhandler.cpp:1262 src/commandhandler.cpp:1269
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1263 src/commandhandler.cpp:1270
+#: src/commandhandler.cpp:1264 src/commandhandler.cpp:1271
msgid "Resource orphaned images:"
msgstr ""
@@ -325,39 +324,30 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s的选项是\"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"。"
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:447
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:450
msgid "General"
msgstr "常规"
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:449
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:452
msgid "Debug"
msgstr "调试 "
-#: src/game.cpp:524
+#: src/game.cpp:525
msgid "Screenshot saved as "
msgstr "截图保存为"
-#: src/game.cpp:532
+#: src/game.cpp:533
msgid "Saving screenshot failed!"
msgstr "保存屏幕快照失败!"
-#: src/game.cpp:593
+#: src/game.cpp:594
msgid "The connection to the server was lost."
msgstr "服务器的连接丢失。"
-#: src/game.cpp:594
+#: src/game.cpp:595
msgid "Network Error"
msgstr "网络错误"
-#: src/game.cpp:980
-msgid "Could Not Load Map"
-msgstr "不能加载地图"
-
-#: src/game.cpp:981
-#, c-format
-msgid "Error while loading %s"
-msgstr "加载%s时出现错误"
-
#: src/gui/beingpopup.cpp:125
#, c-format
msgid "Party: %s"
@@ -388,7 +378,8 @@ msgstr "姓名"
#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:139
#: src/gui/popupmenu.cpp:219 src/gui/popupmenu.cpp:543
-#: src/gui/setupactiondata.h:53 src/net/tmwa/generalhandler.cpp:271
+#: src/gui/setupactiondata.h:53 src/net/eathena/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:271
msgid "Attack"
msgstr "攻击"
@@ -408,13 +399,13 @@ msgstr "移动"
msgid "Result"
msgstr "结果"
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:133
+#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:137
msgid "Reset"
msgstr "重置"
#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
-#: src/gui/popupmenu.cpp:2098
+#: src/gui/popupmenu.cpp:2118
msgid "Buy"
msgstr "购买"
@@ -431,7 +422,7 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
-#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:122
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:126
#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:777
msgid "+"
msgstr "+"
@@ -439,14 +430,14 @@ msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
-#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:123
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:127
#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:789
msgid "-"
msgstr "-"
#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
#: src/gui/setupactiondata.h:158
msgid "Quit"
msgstr "退出"
@@ -463,25 +454,25 @@ msgid "Shop"
msgstr "商店"
#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
-#: src/gui/popupmenu.cpp:2099 src/gui/selldialog.cpp:53
+#: src/gui/popupmenu.cpp:2119 src/gui/selldialog.cpp:53
#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "出售"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:126
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:81
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:290
#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:403
#: src/gui/popupmenu.cpp:429 src/gui/popupmenu.cpp:448
#: src/gui/popupmenu.cpp:464 src/gui/popupmenu.cpp:484
#: src/gui/popupmenu.cpp:629 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:1683 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1774 src/gui/popupmenu.cpp:1830
-#: src/gui/popupmenu.cpp:1867 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1960 src/gui/popupmenu.cpp:1984
-#: src/gui/popupmenu.cpp:2006 src/gui/quitdialog.cpp:55
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1730
+#: src/gui/popupmenu.cpp:1794 src/gui/popupmenu.cpp:1850
+#: src/gui/popupmenu.cpp:1887 src/gui/popupmenu.cpp:1928
+#: src/gui/popupmenu.cpp:1980 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:2026 src/gui/quitdialog.cpp:55
#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
#: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
@@ -552,7 +543,7 @@ msgstr "新的密码输入不匹配。"
msgid "New Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
+#: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:72
#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
msgid "Name:"
msgstr "姓名"
@@ -663,7 +654,7 @@ msgstr "删除字符输入的密码"
msgid "Enter password:"
msgstr "输入密码:"
-#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:269
+#: src/gui/charselectdialog.cpp:558 src/gui/serverdialog.cpp:282
#: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
#: src/gui/textcommandeditor.cpp:196
@@ -743,7 +734,7 @@ msgstr "彩虹3"
#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:94
#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
#: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
#: src/gui/widgets/namesmodel.cpp:48
@@ -773,9 +764,9 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2031
-#: src/gui/popupmenu.cpp:2039 src/gui/popupmenu.cpp:2048
-#: src/gui/popupmenu.cpp:2067
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:2051
+#: src/gui/popupmenu.cpp:2059 src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2087
msgid "Ignore"
msgstr "忽略"
@@ -939,7 +930,7 @@ msgid "Did You Know?"
msgstr "你知道吗?"
#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
-#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:54
+#: src/gui/inventorywindow.cpp:207 src/gui/npcdialog.cpp:56
#: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
msgid "Close"
msgstr "关闭"
@@ -956,33 +947,33 @@ msgstr "下一页>"
msgid "Auto open this window"
msgstr "自动打开这个窗口"
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:80
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "确定"
-#: src/gui/editserverdialog.cpp:56
+#: src/gui/editserverdialog.cpp:65
msgid "Edit Server"
msgstr ""
-#: src/gui/editserverdialog.cpp:64
+#: src/gui/editserverdialog.cpp:73
msgid "Address:"
msgstr ""
-#: src/gui/editserverdialog.cpp:65
+#: src/gui/editserverdialog.cpp:74
msgid "Port:"
msgstr "端口:"
-#: src/gui/editserverdialog.cpp:66
+#: src/gui/editserverdialog.cpp:75
msgid "Server type:"
msgstr "服务器类型:"
-#: src/gui/editserverdialog.cpp:67
+#: src/gui/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
-#: src/gui/editserverdialog.cpp:177
+#: src/gui/editserverdialog.cpp:197
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -991,8 +982,8 @@ msgid "Equipment"
msgstr "装备"
#: src/gui/equipmentwindow.cpp:100 src/gui/inventorywindow.cpp:164
-#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1639
-#: src/gui/popupmenu.cpp:1739 src/gui/popupmenu.cpp:1795
+#: src/gui/inventorywindow.cpp:580 src/gui/popupmenu.cpp:1658
+#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
msgid "Unequip"
msgstr "卸下装备"
@@ -1034,26 +1025,26 @@ msgid "Filter:"
msgstr "过滤器:"
#: src/gui/inventorywindow.cpp:162 src/gui/inventorywindow.cpp:582
-#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1741
-#: src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1660 src/gui/popupmenu.cpp:1761
+#: src/gui/popupmenu.cpp:1817
msgid "Equip"
msgstr "装备"
#: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:586
-#: src/gui/popupmenu.cpp:1645 src/gui/popupmenu.cpp:1708
-#: src/gui/popupmenu.cpp:1745 src/gui/popupmenu.cpp:1801
+#: src/gui/popupmenu.cpp:1664 src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1765 src/gui/popupmenu.cpp:1821
#: src/gui/skilldialog.cpp:242
msgid "Use"
msgstr "使用"
#: src/gui/inventorywindow.cpp:176 src/gui/inventorywindow.cpp:682
-#: src/gui/popupmenu.cpp:1650 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1806
+#: src/gui/popupmenu.cpp:1669 src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1826
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1659
-#: src/gui/popupmenu.cpp:1759 src/gui/popupmenu.cpp:1815
+#: src/gui/inventorywindow.cpp:177 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1779 src/gui/popupmenu.cpp:1835
msgid "Split"
msgstr "分离"
@@ -1067,17 +1058,17 @@ msgid "Weight:"
msgstr "重量:"
#: src/gui/inventorywindow.cpp:205 src/gui/inventorywindow.cpp:673
-#: src/gui/popupmenu.cpp:1625 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/setup.cpp:74
+#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1838 src/gui/setup.cpp:74
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1666
+#: src/gui/inventorywindow.cpp:206 src/gui/popupmenu.cpp:1685
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1655
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1811
+#: src/gui/inventorywindow.cpp:684 src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1831
#: src/gui/windowmenu.cpp:104
msgid "Drop"
msgstr "丢弃"
@@ -1311,24 +1302,24 @@ msgstr "状态栏"
msgid "Need"
msgstr "需要"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:54
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:53
+#: src/gui/npcdialog.cpp:55
msgid "Next"
msgstr "下一个"
-#: src/gui/npcdialog.cpp:55
+#: src/gui/npcdialog.cpp:57
msgid "Submit"
msgstr "提交"
-#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:62 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:156
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:116 src/gui/popupmenu.cpp:503
+#: src/gui/npcdialog.cpp:120 src/gui/popupmenu.cpp:503
msgid "Clear"
msgstr "清除"
@@ -1400,7 +1391,7 @@ msgid "Nuke"
msgstr ""
#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:317
-#: src/gui/popupmenu.cpp:2139
+#: src/gui/popupmenu.cpp:2159
msgid "Add comment"
msgstr "发表评论"
@@ -1420,7 +1411,7 @@ msgstr "优先攻击列表"
msgid "Add to attack list"
msgstr "加入攻击清单"
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2154
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:2174
msgid "Add to ignore list"
msgstr ""
@@ -1433,7 +1424,7 @@ msgid "Players"
msgstr "玩家"
#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:570
-#: src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:2149
msgid "Kick from party"
msgstr "踢从党"
@@ -1441,8 +1432,8 @@ msgstr "踢从党"
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1681
-#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1783 src/gui/popupmenu.cpp:1839
msgid "Add to chat"
msgstr "加入聊天"
@@ -1454,8 +1445,8 @@ msgstr "地图项"
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1958
-#: src/gui/popupmenu.cpp:1982
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:1978
+#: src/gui/popupmenu.cpp:2002
msgid "Remove"
msgstr ""
@@ -1511,7 +1502,7 @@ msgstr "留下"
msgid "Copy to clipboard"
msgstr ""
-#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2127
+#: src/gui/popupmenu.cpp:565 src/gui/popupmenu.cpp:2147
msgid "Invite to party"
msgstr ""
@@ -1520,170 +1511,185 @@ msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1130
+#: src/gui/popupmenu.cpp:1147
msgid "Rename map sign "
msgstr "重命名的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1132
+#: src/gui/popupmenu.cpp:1149
msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1154
+#: src/gui/popupmenu.cpp:1171
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1156
+#: src/gui/popupmenu.cpp:1173
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1630
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1617
+#: src/gui/popupmenu.cpp:1634
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1635
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1619
+#: src/gui/popupmenu.cpp:1636
+#, fuzzy
+msgid "Add to trade all-1"
+msgstr "加入攻击清单"
+
+#: src/gui/popupmenu.cpp:1637
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1629
+#: src/gui/popupmenu.cpp:1647
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1648
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1631
+#: src/gui/popupmenu.cpp:1649
+#, fuzzy
+msgid "Store all-1"
+msgstr "商店所有"
+
+#: src/gui/popupmenu.cpp:1650
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1651 src/gui/popupmenu.cpp:1751
-#: src/gui/popupmenu.cpp:1807
+#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1771
+#: src/gui/popupmenu.cpp:1827
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1670
+#: src/gui/popupmenu.cpp:1689
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1671
+#: src/gui/popupmenu.cpp:1690
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1691
+#, fuzzy
+msgid "Retrieve all-1"
+msgstr "检索所有"
+
+#: src/gui/popupmenu.cpp:1692
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1848
msgid "Clear drop window"
msgstr ""
-#: src/gui/popupmenu.cpp:1856 src/gui/popupmenu.cpp:1893
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1913
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1862 src/gui/popupmenu.cpp:1899
+#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1919
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1905
+#: src/gui/popupmenu.cpp:1925
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1907 src/gui/statuswindow.cpp:248
+#: src/gui/popupmenu.cpp:1927 src/gui/statuswindow.cpp:248
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1927 src/gui/popupmenu.cpp:1978
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:119
+#: src/gui/popupmenu.cpp:1947 src/gui/popupmenu.cpp:1998
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
#: src/gui/socialwindow.cpp:883
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1937 src/gui/popupmenu.cpp:1947
+#: src/gui/popupmenu.cpp:1957 src/gui/popupmenu.cpp:1967
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1949
+#: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1969
msgid "Move down"
msgstr ""
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2138
+#: src/gui/popupmenu.cpp:2023 src/gui/popupmenu.cpp:2158
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:2029
+#: src/gui/popupmenu.cpp:2049
msgid "Be friend"
msgstr "是朋友"
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2038
-#: src/gui/popupmenu.cpp:2047 src/gui/popupmenu.cpp:2066
-#: src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2058
+#: src/gui/popupmenu.cpp:2067 src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2094
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:2032 src/gui/popupmenu.cpp:2040
-#: src/gui/popupmenu.cpp:2068
+#: src/gui/popupmenu.cpp:2052 src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2088
msgid "Black list"
msgstr ""
-#: src/gui/popupmenu.cpp:2033 src/gui/popupmenu.cpp:2041
-#: src/gui/popupmenu.cpp:2049
+#: src/gui/popupmenu.cpp:2053 src/gui/popupmenu.cpp:2061
+#: src/gui/popupmenu.cpp:2069
msgid "Set as enemy"
msgstr ""
-#: src/gui/popupmenu.cpp:2034 src/gui/popupmenu.cpp:2042
-#: src/gui/popupmenu.cpp:2050 src/gui/popupmenu.cpp:2056
-#: src/gui/popupmenu.cpp:2061 src/gui/popupmenu.cpp:2069
+#: src/gui/popupmenu.cpp:2054 src/gui/popupmenu.cpp:2062
+#: src/gui/popupmenu.cpp:2070 src/gui/popupmenu.cpp:2076
+#: src/gui/popupmenu.cpp:2081 src/gui/popupmenu.cpp:2089
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:2046 src/gui/popupmenu.cpp:2054
-#: src/gui/popupmenu.cpp:2060 src/gui/popupmenu.cpp:2065
-#: src/gui/popupmenu.cpp:2073
+#: src/gui/popupmenu.cpp:2066 src/gui/popupmenu.cpp:2074
+#: src/gui/popupmenu.cpp:2080 src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2093
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:2055 src/gui/popupmenu.cpp:2075
+#: src/gui/popupmenu.cpp:2075 src/gui/popupmenu.cpp:2095
#: src/playerrelations.cpp:468
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:2085
+#: src/gui/popupmenu.cpp:2105
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:2086
+#: src/gui/popupmenu.cpp:2106
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:2104 src/gui/popupmenu.cpp:2115
+#: src/gui/popupmenu.cpp:2124 src/gui/popupmenu.cpp:2135
msgid "Buy (?)"
msgstr "购买(?)"
-#: src/gui/popupmenu.cpp:2105 src/gui/popupmenu.cpp:2116
+#: src/gui/popupmenu.cpp:2125 src/gui/popupmenu.cpp:2136
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:2137
+#: src/gui/popupmenu.cpp:2157
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:2148
+#: src/gui/popupmenu.cpp:2168
msgid "Remove from pickup list"
msgstr ""
-#: src/gui/popupmenu.cpp:2152
+#: src/gui/popupmenu.cpp:2172
msgid "Add to pickup list"
msgstr ""
@@ -1727,58 +1733,58 @@ msgstr "密码不能少于%d个字符。"
msgid "Passwords do not match."
msgstr "密码不一致."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:244
msgid "Choose Your Server"
msgstr "选择您的服务器"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:255
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "选择你的服务器***安全模式***"
-#: src/gui/serverdialog.cpp:246
+#: src/gui/serverdialog.cpp:259
msgid "Use same ip for game sub servers"
msgstr "游戏分服务器使用相同的IP"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:278
msgid "Load"
msgstr "负载"
-#: src/gui/serverdialog.cpp:266
+#: src/gui/serverdialog.cpp:279
msgid "Connect"
msgstr "连接"
-#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
msgid "Add"
msgstr "添加"
-#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
#: src/gui/widgets/setupitem.cpp:410
msgid "Edit"
msgstr "编辑"
-#: src/gui/serverdialog.cpp:485
+#: src/gui/serverdialog.cpp:498
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "下载服务器列表...%2.2f%%"
-#: src/gui/serverdialog.cpp:490
+#: src/gui/serverdialog.cpp:503
msgid "Waiting for server..."
msgstr "等待服务器..."
-#: src/gui/serverdialog.cpp:494
+#: src/gui/serverdialog.cpp:507
msgid "Preparing download"
msgstr "准备下载"
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:511
msgid "Error retreiving server list!"
msgstr "恢复服务器列表错误!"
-#: src/gui/serverdialog.cpp:586
+#: src/gui/serverdialog.cpp:599
msgid "requires a newer version"
msgstr "需要较新版本"
-#: src/gui/serverdialog.cpp:588
+#: src/gui/serverdialog.cpp:601
#, c-format
msgid "requires v%s"
msgstr "需要 v%s"
@@ -2612,18 +2618,18 @@ msgstr ""
msgid "Default"
msgstr "预设"
-#: src/gui/setup_input.cpp:193
+#: src/gui/setup_input.cpp:195
msgid "Key Conflict(s) Detected."
msgstr "检测到按键冲突。"
-#: src/gui/setup_input.cpp:194
+#: src/gui/setup_input.cpp:196
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
-#: src/gui/setup_input.cpp:351
+#: src/gui/setup_input.cpp:353
msgid "unknown"
msgstr ""
@@ -3075,131 +3081,162 @@ msgstr "关系"
msgid "When ignoring:"
msgstr "当忽略时:"
-#: src/gui/setup_theme.cpp:82
+#: src/gui/setup_theme.cpp:84
+msgid "Very small (9)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
msgid "Tiny (10)"
msgstr "小(10)"
-#: src/gui/setup_theme.cpp:83
+#: src/gui/setup_theme.cpp:86
msgid "Small (11)"
msgstr "小 (11)"
-#: src/gui/setup_theme.cpp:84
+#: src/gui/setup_theme.cpp:87
msgid "Medium (12)"
msgstr "中 (12)"
-#: src/gui/setup_theme.cpp:85
-msgid "Large (13)"
+#: src/gui/setup_theme.cpp:88
+#, fuzzy
+msgid "Normal (13)"
+msgstr "正常"
+
+#: src/gui/setup_theme.cpp:89
+#, fuzzy
+msgid "Large (14)"
msgstr "大 (13)"
-#: src/gui/setup_theme.cpp:86
-msgid "Big (14)"
+#: src/gui/setup_theme.cpp:90
+#, fuzzy
+msgid "Very large (15)"
+msgstr "大 (13)"
+
+#: src/gui/setup_theme.cpp:91
+#, fuzzy
+msgid "Big (16)"
msgstr "大(14)"
-#: src/gui/setup_theme.cpp:87
-msgid "Huge (15)"
+#: src/gui/setup_theme.cpp:92
+msgid "Very big (17)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:93
+#, fuzzy
+msgid "Huge (18)"
+msgstr "巨大的 (15)"
+
+#: src/gui/setup_theme.cpp:94
+#, fuzzy
+msgid "Very huge (19)"
msgstr "巨大的 (15)"
-#: src/gui/setup_theme.cpp:120
+#: src/gui/setup_theme.cpp:127
msgid "Chinese (China)"
msgstr ""
-#: src/gui/setup_theme.cpp:121
+#: src/gui/setup_theme.cpp:128
msgid "Czech"
msgstr ""
-#: src/gui/setup_theme.cpp:122
+#: src/gui/setup_theme.cpp:129
msgid "English"
msgstr ""
-#: src/gui/setup_theme.cpp:123
+#: src/gui/setup_theme.cpp:130
msgid "Finnish"
msgstr ""
-#: src/gui/setup_theme.cpp:124
+#: src/gui/setup_theme.cpp:131
msgid "French"
msgstr ""
-#: src/gui/setup_theme.cpp:125
+#: src/gui/setup_theme.cpp:132
msgid "German"
msgstr ""
-#: src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:133
msgid "Indonesian"
msgstr ""
-#: src/gui/setup_theme.cpp:127
+#: src/gui/setup_theme.cpp:134
msgid "Polish"
msgstr ""
-#: src/gui/setup_theme.cpp:128
+#: src/gui/setup_theme.cpp:135
msgid "Japanese"
msgstr ""
-#: src/gui/setup_theme.cpp:129
+#: src/gui/setup_theme.cpp:136
msgid "Dutch (Belgium/Flemish)"
msgstr ""
-#: src/gui/setup_theme.cpp:130
+#: src/gui/setup_theme.cpp:137
msgid "Portuguese"
msgstr ""
-#: src/gui/setup_theme.cpp:131
+#: src/gui/setup_theme.cpp:138
msgid "Portuguese (Brazilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:132
+#: src/gui/setup_theme.cpp:139
msgid "Russian"
msgstr ""
-#: src/gui/setup_theme.cpp:133
+#: src/gui/setup_theme.cpp:140
msgid "Spanish (Castilian)"
msgstr ""
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:173
msgid "Theme"
msgstr "主题"
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:175
msgid "Gui theme"
msgstr "桂主题"
-#: src/gui/setup_theme.cpp:168
+#: src/gui/setup_theme.cpp:176
msgid "Language"
msgstr ""
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:177
msgid "Main Font"
msgstr "主要字体"
-#: src/gui/setup_theme.cpp:170
+#: src/gui/setup_theme.cpp:178
msgid "Bold font"
msgstr "加粗字体"
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:179
msgid "Particle font"
msgstr "粒子字体"
-#: src/gui/setup_theme.cpp:172
+#: src/gui/setup_theme.cpp:180
msgid "Help font"
msgstr "帮助字体"
-#: src/gui/setup_theme.cpp:173
+#: src/gui/setup_theme.cpp:181
msgid "Secure font"
msgstr "安全字体"
-#: src/gui/setup_theme.cpp:174
+#: src/gui/setup_theme.cpp:182
msgid "Japanese font"
msgstr "日文字体"
-#: src/gui/setup_theme.cpp:211
+#: src/gui/setup_theme.cpp:219
msgid "Font size"
msgstr "字体大小"
-#: src/gui/setup_theme.cpp:352
+#: src/gui/setup_theme.cpp:225
+#, fuzzy
+msgid "Npc font size"
+msgstr "字体大小"
+
+#: src/gui/setup_theme.cpp:371
msgid "Theme Changed"
msgstr "主题更改"
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_theme.cpp:371 src/gui/setup_video.cpp:496
#: src/gui/setup_video.cpp:503
msgid "Restart your client for the change to take effect."
msgstr "重启您的游戏客户端以使变更生效。"
@@ -3434,7 +3471,6 @@ msgid "Auction"
msgstr "拍卖"
#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
-#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "请求交易"
@@ -4352,7 +4388,7 @@ msgstr ""
msgid "Choose World"
msgstr ""
-#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:82
+#: src/inputmanager.cpp:307 src/inputmanager.cpp:345 src/keyboardconfig.cpp:88
#, c-format
msgid "key_%d"
msgstr ""
@@ -4374,7 +4410,7 @@ msgid "JB%d"
msgstr ""
#. TRANSLATORS: Unknown key short string. This string must be maximum 5 chars
-#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:94
+#: src/inputmanager.cpp:363 src/keyboardconfig.cpp:100
msgid "u key"
msgstr ""
@@ -4720,7 +4756,7 @@ msgstr ""
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4158
+#: src/localplayer.cpp:4160
msgid "You see "
msgstr "你看"
@@ -4892,7 +4928,7 @@ msgstr ""
msgid "Incorrect race."
msgstr ""
-#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:212
+#: src/net/ea/charserverhandler.cpp:182
msgid "Info"
msgstr "信息"
@@ -4958,7 +4994,7 @@ msgstr "游戏"
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+#: src/net/ea/guildhandler.cpp:83
msgid "Guild created."
msgstr "帮会已创建"
@@ -5173,7 +5209,7 @@ msgstr "无法装备。"
msgid "Account was not found. Please re-login."
msgstr "帐号不存在。请重新登录。"
-#: src/net/ea/loginhandler.cpp:149 src/net/manaserv/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:149
msgid "Old password incorrect."
msgstr "旧密码不正确。"
@@ -5182,9 +5218,6 @@ msgid "New password too short."
msgstr "新密码太短。"
#: src/net/ea/loginhandler.cpp:155 src/net/ea/loginhandler.cpp:267
-#: src/net/manaserv/charhandler.cpp:183 src/net/manaserv/loginhandler.cpp:103
-#: src/net/manaserv/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:171
-#: src/net/manaserv/loginhandler.cpp:292 src/net/manaserv/loginhandler.cpp:329
msgid "Unknown error."
msgstr "未知的错误。"
@@ -5286,23 +5319,23 @@ msgstr "%s已经离开你的帮会。"
msgid "An unknown member tried to say: %s"
msgstr "一未知成员尝试说:%s"
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:98
msgid "You are dead."
msgstr "你已玩完了。"
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:99
msgid "We regret to inform you that your character was killed in battle."
msgstr "很遗憾的告诉您,您的角色在战斗中死亡了"
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:101
msgid "You are not that alive anymore."
msgstr "你再也不是那样的生机勃勃了。"
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:102
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr ""
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:103
msgid "Game Over!"
msgstr "游戏结束!"
@@ -5310,39 +5343,39 @@ msgstr "游戏结束!"
msgid "Insert coin to continue."
msgstr "投入游戏币继续。"
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:105
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr "不,孩子。你的角色没有真正死亡。他……呃……不过是去了一个更好的地方而已。"
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:107
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr ""
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:109
msgid "I guess this did not run too well."
msgstr "我猜这进行得并不顺利。"
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:111
msgid "Do you want your possessions identified?"
msgstr ""
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:331
+#: src/net/ea/playerhandler.cpp:113
msgid "Sadly, no trace of you was ever found..."
msgstr ""
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:333
+#: src/net/ea/playerhandler.cpp:115
msgid "Annihilated."
msgstr "被消灭了。"
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:334
+#: src/net/ea/playerhandler.cpp:117
msgid "Looks like you got your head handed to you."
msgstr ""
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:336
+#: src/net/ea/playerhandler.cpp:119
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
@@ -5515,493 +5548,231 @@ msgstr "无法偷取任何物品..."
msgid "Poison had no effect..."
msgstr "毒药无效..."
-#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s想和您进行交易,是否接受?"
-
-#: src/net/ea/tradehandler.cpp:135
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "交易不可能进行。与交易伙伴太过太过遥远"
-
-#: src/net/ea/tradehandler.cpp:139
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "交易不可能进行。角色不存在。"
-
-#: src/net/ea/tradehandler.cpp:143
-msgid "Trade cancelled due to an unknown reason."
-msgstr "交易取消因不明原因。"
-
-#: src/net/ea/tradehandler.cpp:149
-#, c-format
-msgid "Trade: You and %s"
-msgstr "交易:您和%s"
-
-#: src/net/ea/tradehandler.cpp:159
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "与%s的交易被取消。"
-
-#: src/net/ea/tradehandler.cpp:172
-msgid "Unhandled trade cancel packet."
-msgstr "未处理的交易取消分组。"
-
-#: src/net/ea/tradehandler.cpp:237
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "添加项目失败。交易伙伴已经负重太多。"
-
-#: src/net/ea/tradehandler.cpp:242
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
-
-#: src/net/ea/tradehandler.cpp:247
-msgid "Failed adding item. You can't trade this item."
-msgstr "添加物品失败。您不能交易这项物品."
-
-#: src/net/ea/tradehandler.cpp:251
-msgid "Failed adding item for unknown reason."
-msgstr "添加项目失败,原因未知。"
-
-#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
-msgid "Trade canceled."
-msgstr "交易取消。"
-
-#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
-msgid "Trade completed."
-msgstr "交易完成。"
-
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:264
-msgid "Strength"
-msgstr "力量"
-
-#: src/net/manaserv/attributes.cpp:167
-#, c-format
-msgid "Strength %+.1f"
-msgstr "力量%+.1f"
-
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:265
-msgid "Agility"
-msgstr "敏捷"
-
-#: src/net/manaserv/attributes.cpp:180
-#, c-format
-msgid "Agility %+.1f"
-msgstr "敏捷 %+.1f"
-
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:268
-msgid "Dexterity"
-msgstr "敏捷"
-
-#: src/net/manaserv/attributes.cpp:193
-#, c-format
-msgid "Dexterity %+.1f"
-msgstr "灵巧%+.1f"
-
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:266
-msgid "Vitality"
-msgstr "生命"
-
-#: src/net/manaserv/attributes.cpp:206
-#, c-format
-msgid "Vitality %+.1f"
-msgstr "活力%+.1f"
-
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:267
-msgid "Intelligence"
-msgstr "智慧"
-
-#: src/net/manaserv/attributes.cpp:219
-#, c-format
-msgid "Intelligence %+.1f"
-msgstr "智慧%+.1f"
-
-#: src/net/manaserv/attributes.cpp:225
-msgid "Willpower"
-msgstr "意志"
-
-#: src/net/manaserv/attributes.cpp:232
-#, c-format
-msgid "Willpower %+.1f"
-msgstr "意志力%+.1f"
-
-#: src/net/manaserv/beinghandler.cpp:341
-msgid "Press OK to respawn."
-msgstr "按确定以重生。"
-
-#: src/net/manaserv/beinghandler.cpp:342
-msgid "You Died"
-msgstr "你死了"
-
-#: src/net/manaserv/charhandler.cpp:147 src/net/manaserv/charhandler.cpp:221
-msgid "Not logged in."
-msgstr "未登录。"
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "No empty slot."
-msgstr "无空槽。"
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid name."
-msgstr "名称无效。"
-
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Character's name already exists."
-msgstr "人物的名字已经存在。"
-
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Invalid hairstyle."
-msgstr "无效的发型。"
-
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Invalid hair color."
-msgstr "头发的颜色无效。"
-
-#: src/net/manaserv/charhandler.cpp:165
-msgid "Invalid gender."
-msgstr "无效的性别。"
-
-#: src/net/manaserv/charhandler.cpp:168
-msgid "Character's stats are too high."
-msgstr "字符的统计太高。"
-
-#: src/net/manaserv/charhandler.cpp:171
-msgid "Character's stats are too low."
-msgstr "字符的统计过低。"
-
-#: src/net/manaserv/charhandler.cpp:174
-#, c-format
-msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:180
-msgid "Invalid slot number."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:212
-msgid "Player deleted."
-msgstr "删除。"
-
-#: src/net/manaserv/charhandler.cpp:224
-msgid "Selection out of range."
-msgstr "范围。"
-
-#: src/net/manaserv/charhandler.cpp:227
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "未知错误(%d)"
-
-#: src/net/manaserv/charhandler.cpp:263
-msgid "No gameservers are available."
-msgstr "无 游戏服务器 可用。"
-
-#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
-#: src/net/manaserv/guildhandler.cpp:265
-#, c-format
-msgid "Topic: %s"
-msgstr "主题:%s"
-
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-msgid "Players in this channel:"
-msgstr "玩家在此通道:"
-
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "加入通道时发生错误。"
-
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "上市渠道。"
-
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:299
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:304
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:320
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:331
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s已被%s踢出"
-
-#: src/net/manaserv/chathandler.cpp:337
-msgid "Unknown channel event."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:90
-msgid "Error creating guild."
-msgstr "创建公会时发生错误。"
-
-#: src/net/manaserv/guildhandler.cpp:100
-msgid "Invite sent."
-msgstr "邀请已发送。"
-
-#: src/net/manaserv/guildhandler.cpp:207
-msgid "Member was promoted successfully."
-msgstr "会员晋升成功。"
-
-#: src/net/manaserv/guildhandler.cpp:212
-msgid "Failed to promote member."
-msgstr "晋升会员失败。"
-
-#: src/net/manaserv/loginhandler.cpp:94
-msgid "Wrong magic_token."
-msgstr "错误magic_token。"
-
-#: src/net/manaserv/loginhandler.cpp:97 src/net/manaserv/loginhandler.cpp:282
-msgid "Already logged in."
-msgstr "已登录。"
-
-#: src/net/manaserv/loginhandler.cpp:100
-msgid "Account banned."
-msgstr "帐户被禁止。"
-
-#: src/net/manaserv/loginhandler.cpp:125
-msgid "New password incorrect."
-msgstr "新密码不正确。"
-
-#: src/net/manaserv/loginhandler.cpp:132 src/net/manaserv/loginhandler.cpp:164
-msgid "Account not connected. Please login first."
-msgstr "账户未连接。请先登录。"
-
-#: src/net/manaserv/loginhandler.cpp:157
-msgid "New email address incorrect."
-msgstr "新的电子邮件地址不正确。"
-
-#: src/net/manaserv/loginhandler.cpp:160
-msgid "Old email address incorrect."
-msgstr "旧的电子邮件地址不正确。"
-
-#: src/net/manaserv/loginhandler.cpp:168
-msgid "The new email address already exists."
-msgstr "新的电子邮件地址已存在。"
-
-#: src/net/manaserv/loginhandler.cpp:250
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr "客户端注册是不允许的。请联系服务器管理。"
-
-#: src/net/manaserv/loginhandler.cpp:276 src/net/manaserv/loginhandler.cpp:313
-msgid "Client version is too old."
-msgstr "客户端版本太旧。"
-
-#: src/net/manaserv/loginhandler.cpp:279
-msgid "Wrong username or password."
-msgstr "用户名或密码错误。"
-
-#: src/net/manaserv/loginhandler.cpp:285
-msgid "Account banned"
-msgstr "帐户被禁止"
-
-#: src/net/manaserv/loginhandler.cpp:288
-msgid "Login attempt too soon after previous attempt."
-msgstr "登录尝试后,以前的尝试还为时过早。"
-
-#: src/net/manaserv/loginhandler.cpp:316
-msgid "Wrong username, password or email address."
-msgstr "错误的用户名,密码或电子邮件地址。"
-
-#: src/net/manaserv/loginhandler.cpp:319
-msgid "Username already exists."
-msgstr "用户名已存在。"
-
-#: src/net/manaserv/loginhandler.cpp:322
-msgid "Email address already exists."
-msgstr "电子邮件地址已存在。"
-
-#: src/net/manaserv/loginhandler.cpp:325
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "你的时间太长与CAPTCHA或你的反应是不正确的。"
-
-#: src/net/manaserv/partyhandler.cpp:90
-msgid "Joined party."
-msgstr "加入了帮会。"
-
-#: src/net/manaserv/partyhandler.cpp:108
-#, c-format
-msgid "%s joined the party."
-msgstr "%s加入了帮会。"
-
-#: src/net/manaserv/partyhandler.cpp:126
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s的拒绝你的邀请。"
-
-#: src/net/manaserv/tradehandler.cpp:107
-msgid "Accepting incoming trade requests."
-msgstr "正在接受交易请求"
-
-#: src/net/manaserv/tradehandler.cpp:109
-msgid "Ignoring incoming trade requests."
-msgstr "忽略交易请求"
-
-#: src/net/manaserv/tradehandler.cpp:146
-#, c-format
-msgid "Trading with %s"
-msgstr "与%s交易中"
-
-#: src/net/tmwa/adminhandler.cpp:70
+#: src/net/eathena/adminhandler.cpp:70 src/net/tmwa/adminhandler.cpp:70
msgid "Kick failed!"
msgstr "踢出失败!"
-#: src/net/tmwa/adminhandler.cpp:72
+#: src/net/eathena/adminhandler.cpp:72 src/net/tmwa/adminhandler.cpp:72
msgid "Kick succeeded!"
msgstr "成功踢出!"
-#: src/net/tmwa/buysellhandler.cpp:133
+#: src/net/eathena/buysellhandler.cpp:129 src/net/tmwa/buysellhandler.cpp:133
msgid "Thanks for selling."
msgstr "感谢您的出售。"
-#: src/net/tmwa/buysellhandler.cpp:137
+#: src/net/eathena/buysellhandler.cpp:133 src/net/tmwa/buysellhandler.cpp:137
msgid "Unable to sell."
msgstr "无法出售."
-#: src/net/tmwa/buysellhandler.cpp:140
+#: src/net/eathena/buysellhandler.cpp:136 src/net/tmwa/buysellhandler.cpp:140
msgid "Unable to sell while trading."
msgstr "不能出售,交易。"
-#: src/net/tmwa/buysellhandler.cpp:143
+#: src/net/eathena/buysellhandler.cpp:139 src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:108
+#: src/net/eathena/generalhandler.cpp:108 src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "力量 %+d"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/eathena/generalhandler.cpp:109 src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "敏捷 %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/eathena/generalhandler.cpp:110 src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "生命 %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/eathena/generalhandler.cpp:111 src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "智慧 %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/eathena/generalhandler.cpp:112 src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "敏捷 %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/eathena/generalhandler.cpp:113 src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "幸运 %+d"
-#: src/net/tmwa/generalhandler.cpp:139
+#: src/net/eathena/generalhandler.cpp:139 src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "身份验证失败。"
-#: src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "没有可用的服务器。"
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:147
msgid "Someone else is trying to use this account."
msgstr "别人尝试使用该帐户。"
-#: src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:152
msgid "This account is already logged in."
msgstr "此帐户已登录。"
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/eathena/generalhandler.cpp:156 src/net/tmwa/generalhandler.cpp:156
msgid "Speed hack detected."
msgstr "检测速度劈。"
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:159
msgid "Duplicated login."
msgstr "重复登录。"
-#: src/net/tmwa/generalhandler.cpp:162
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:162
msgid "Unknown connection error."
msgstr "未知的连接错误。"
-#: src/net/tmwa/generalhandler.cpp:234
+#: src/net/eathena/generalhandler.cpp:234 src/net/tmwa/generalhandler.cpp:234
msgid "Got disconnected from server!"
msgstr "和服务器失去连接"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:264
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:265
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:266
+msgid "Vitality"
+msgstr "生命"
+
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:267
+msgid "Intelligence"
+msgstr "智慧"
+
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:268
+msgid "Dexterity"
+msgstr "敏捷"
+
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:269
msgid "Luck"
msgstr "幸运"
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/eathena/generalhandler.cpp:272 src/net/tmwa/generalhandler.cpp:272
msgid "Defense"
msgstr "防御"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:273
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/eathena/generalhandler.cpp:274 src/net/tmwa/generalhandler.cpp:274
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/eathena/generalhandler.cpp:276 src/net/tmwa/generalhandler.cpp:276
#, no-c-format
msgid "% Accuracy"
msgstr "%精度"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/eathena/generalhandler.cpp:278 src/net/tmwa/generalhandler.cpp:278
#, no-c-format
msgid "% Evade"
msgstr "%闪避"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:280 src/net/tmwa/generalhandler.cpp:280
#, no-c-format
msgid "% Critical"
msgstr "%"
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:281
msgid "Attack Delay"
msgstr "攻击延迟"
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:283
msgid "Walk Delay"
msgstr "步行延迟"
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:285
msgid "Attack Range"
msgstr "攻击范围"
-#: src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:287
msgid "Damage per sec."
msgstr "每秒伤害"
-#: src/net/tmwa/network.cpp:154
+#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
msgstr "空的地址给网络:连接()!"
-#: src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
msgid "Unable to resolve host \""
msgstr "无法解析主机“"
-#: src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
msgid "Connection to server terminated. "
msgstr "连接到服务器终止。"
-#: src/net/tmwa/partyhandler.cpp:172
+#: src/net/eathena/partyhandler.cpp:172 src/net/tmwa/partyhandler.cpp:172
#, c-format
msgid "%s is not in your party!"
msgstr "%s不在你的帮会中!"
+#: src/net/ea/tradehandler.cpp:105
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s想和您进行交易,是否接受?"
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "交易不可能进行。与交易伙伴太过太过遥远"
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "交易不可能进行。角色不存在。"
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr "交易取消因不明原因。"
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr "交易:您和%s"
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "与%s的交易被取消。"
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr "未处理的交易取消分组。"
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "添加项目失败。交易伙伴已经负重太多。"
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr "添加物品失败。您不能交易这项物品."
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr "添加项目失败,原因未知。"
+
+#: src/net/ea/tradehandler.cpp:270
+msgid "Trade canceled."
+msgstr "交易取消。"
+
+#: src/net/ea/tradehandler.cpp:281
+msgid "Trade completed."
+msgstr "交易完成。"
+
#: src/playerrelations.cpp:482
msgid "Print '...'"
msgstr ""
@@ -6046,3 +5817,172 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "未知物品"
+
+#~ msgid "Could Not Load Map"
+#~ msgstr "不能加载地图"
+
+#~ msgid "Error while loading %s"
+#~ msgstr "加载%s时出现错误"
+
+#~ msgid "Strength %+.1f"
+#~ msgstr "力量%+.1f"
+
+#~ msgid "Agility %+.1f"
+#~ msgstr "敏捷 %+.1f"
+
+#~ msgid "Dexterity %+.1f"
+#~ msgstr "灵巧%+.1f"
+
+#~ msgid "Vitality %+.1f"
+#~ msgstr "活力%+.1f"
+
+#~ msgid "Intelligence %+.1f"
+#~ msgstr "智慧%+.1f"
+
+#~ msgid "Willpower"
+#~ msgstr "意志"
+
+#~ msgid "Willpower %+.1f"
+#~ msgstr "意志力%+.1f"
+
+#~ msgid "Press OK to respawn."
+#~ msgstr "按确定以重生。"
+
+#~ msgid "You Died"
+#~ msgstr "你死了"
+
+#~ msgid "Not logged in."
+#~ msgstr "未登录。"
+
+#~ msgid "No empty slot."
+#~ msgstr "无空槽。"
+
+#~ msgid "Invalid name."
+#~ msgstr "名称无效。"
+
+#~ msgid "Character's name already exists."
+#~ msgstr "人物的名字已经存在。"
+
+#~ msgid "Invalid hairstyle."
+#~ msgstr "无效的发型。"
+
+#~ msgid "Invalid hair color."
+#~ msgstr "头发的颜色无效。"
+
+#~ msgid "Invalid gender."
+#~ msgstr "无效的性别。"
+
+#~ msgid "Character's stats are too high."
+#~ msgstr "字符的统计太高。"
+
+#~ msgid "Character's stats are too low."
+#~ msgstr "字符的统计过低。"
+
+#~ msgid "Player deleted."
+#~ msgstr "删除。"
+
+#~ msgid "Selection out of range."
+#~ msgstr "范围。"
+
+#~ msgid "Unknown error (%d)."
+#~ msgstr "未知错误(%d)"
+
+#~ msgid "No gameservers are available."
+#~ msgstr "无 游戏服务器 可用。"
+
+#~ msgid "Topic: %s"
+#~ msgstr "主题:%s"
+
+#~ msgid "Players in this channel:"
+#~ msgstr "玩家在此通道:"
+
+#~ msgid "Error joining channel."
+#~ msgstr "加入通道时发生错误。"
+
+#~ msgid "Listing channels."
+#~ msgstr "上市渠道。"
+
+#~ msgid "%s has kicked %s."
+#~ msgstr "%s已被%s踢出"
+
+#~ msgid "Error creating guild."
+#~ msgstr "创建公会时发生错误。"
+
+#~ msgid "Invite sent."
+#~ msgstr "邀请已发送。"
+
+#~ msgid "Member was promoted successfully."
+#~ msgstr "会员晋升成功。"
+
+#~ msgid "Failed to promote member."
+#~ msgstr "晋升会员失败。"
+
+#~ msgid "Wrong magic_token."
+#~ msgstr "错误magic_token。"
+
+#~ msgid "Already logged in."
+#~ msgstr "已登录。"
+
+#~ msgid "Account banned."
+#~ msgstr "帐户被禁止。"
+
+#~ msgid "New password incorrect."
+#~ msgstr "新密码不正确。"
+
+#~ msgid "Account not connected. Please login first."
+#~ msgstr "账户未连接。请先登录。"
+
+#~ msgid "New email address incorrect."
+#~ msgstr "新的电子邮件地址不正确。"
+
+#~ msgid "Old email address incorrect."
+#~ msgstr "旧的电子邮件地址不正确。"
+
+#~ msgid "The new email address already exists."
+#~ msgstr "新的电子邮件地址已存在。"
+
+#~ msgid ""
+#~ "Client registration is not allowed. Please contact server administration."
+#~ msgstr "客户端注册是不允许的。请联系服务器管理。"
+
+#~ msgid "Client version is too old."
+#~ msgstr "客户端版本太旧。"
+
+#~ msgid "Wrong username or password."
+#~ msgstr "用户名或密码错误。"
+
+#~ msgid "Account banned"
+#~ msgstr "帐户被禁止"
+
+#~ msgid "Login attempt too soon after previous attempt."
+#~ msgstr "登录尝试后,以前的尝试还为时过早。"
+
+#~ msgid "Wrong username, password or email address."
+#~ msgstr "错误的用户名,密码或电子邮件地址。"
+
+#~ msgid "Username already exists."
+#~ msgstr "用户名已存在。"
+
+#~ msgid "Email address already exists."
+#~ msgstr "电子邮件地址已存在。"
+
+#~ msgid "You took too long with the captcha or your response was incorrect."
+#~ msgstr "你的时间太长与CAPTCHA或你的反应是不正确的。"
+
+#~ msgid "Joined party."
+#~ msgstr "加入了帮会。"
+
+#~ msgid "%s joined the party."
+#~ msgstr "%s加入了帮会。"
+
+#~ msgid "%s rejected your invite."
+#~ msgstr "%s的拒绝你的邀请。"
+
+#~ msgid "Accepting incoming trade requests."
+#~ msgstr "正在接受交易请求"
+
+#~ msgid "Ignoring incoming trade requests."
+#~ msgstr "忽略交易请求"
+
+#~ msgid "Trading with %s"
+#~ msgstr "与%s交易中"