Merge branch 'master' of gitorious.org:manaplus/manaplus

author: Reid <reidyaro@gmail.com> 2012-01-25 22:05:36 +0100
committer: Reid <reidyaro@gmail.com> 2012-01-25 22:05:36 +0100
commit: 8b612abb42853a22c1a9545e2c9280d154646543 (patch)
tree: f466167087c2b2de4b8aa9e6d1d1986f72f84147 /po
parent: a913dd41df61760de6ece552f941e002251ff54c (diff)
parent: d340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
download: manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
manaplus-8b612abb42853a22c1a9545e2c9280d154646543.zip
15 files changed, 8310 insertions, 8913 deletions
diff --git a/po/cs.po b/po/cs.po
index 32d446ea4..97aac2408 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
 "cs/)\n"
 "Language: cs\n"
@@ -43,113 +43,113 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Nelze zaslat prázdné šeptání!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,105 +158,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:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Chybí jméno guildy."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Zpráva zavírá chat."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Enter nyní přepíná chat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukončuje chat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "přítel"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "přehlížený"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutrální"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Hráč je již %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hráč byl úspěšně zařazen jako %s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Hráč nemůže být zařazen jako %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Hráč nebyl ignorován!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Hráč již není ignorován!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Hráč nemůže být odignorován!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Hráč již byl vymazán!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Hráč byl úspěšně vymazán!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -264,7 +264,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -272,7 +272,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -280,7 +280,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -288,7 +288,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -296,27 +296,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "velikost chache fontů"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Velikost cache:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Vytvořeno:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Odstraněno:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -325,43 +325,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -396,7 +396,7 @@ msgstr "Jméno"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Útok"
 
@@ -415,7 +415,7 @@ msgstr ""
 msgid "Result"
 msgstr "Výsledek"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Vynulovat"
 
@@ -438,16 +438,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr ""
 
@@ -459,8 +459,8 @@ msgid "Quit"
 msgstr "Ukončit"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Vše"
 
@@ -484,14 +484,14 @@ msgstr "Prodej"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -523,7 +523,7 @@ msgid "The email address entries mismatch."
 msgstr "Emailové adresy nesouhlasí."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Změnit heslo"
 
@@ -589,8 +589,8 @@ msgstr "Účes:"
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -632,47 +632,47 @@ msgstr "Jste si jistí, že chcete smazat tuto postavu?"
 msgid "Account and Character Management"
 msgstr "Správa účtu a postavy"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Přepnout přihlášení"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Změnit email"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Vybrat"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
@@ -746,12 +746,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomno: %s; %d hráčů je přítomno."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -915,7 +915,7 @@ msgid "Did You Know?"
 msgstr "Víte že ... ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Zavřít"
@@ -943,8 +943,8 @@ msgstr "Vybavení"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
@@ -986,26 +986,26 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Vybavit"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Použít"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Upustit..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Rozdělit"
 
@@ -1019,17 +1019,17 @@ msgid "Weight:"
 msgstr "Hmotnost:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Uložit"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upustit"
@@ -1254,31 +1254,27 @@ msgstr "stavový řádek"
 msgid "Need"
 msgstr "Potřebuješ"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Čeká se na server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Další"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Odeslat"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Vyprázdnit"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Další"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Komu:"
@@ -1297,6 +1293,7 @@ msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
@@ -1380,7 +1377,7 @@ msgstr "Odignorovat"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -1432,7 +1429,7 @@ msgid "Show Items"
 msgstr "Zobrazit věci"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Svléct"
 
@@ -1484,8 +1481,8 @@ msgstr "Hráči"
 msgid "Pick up"
 msgstr "Sebrat"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Vložit do chatu"
 
@@ -1497,8 +1494,8 @@ msgstr "Označit na mapě"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -1507,8 +1504,8 @@ msgid "Warp"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Načíst staré výstroje"
+msgid "Clear outfit"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1546,119 +1543,118 @@ msgstr "Zapnout \"away\""
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Odejít"
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Zkopírovat do chatu"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 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:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Jméno:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Hráčův komentář"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Komentář:                      "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Přidat do transakce"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Přidat 10 do transakce"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Přidat polovinu do transakce"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Přidat vše do transakce"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Uschovat 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Uschovat všechny"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Upustit vše"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Načíst staré zkratky věcí"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Načíst staré zkratky upuštění"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Skrýt"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Zobrazit"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Posunout nahoru"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -1755,11 +1751,11 @@ msgstr "Připravuji stažení"
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -2703,194 +2699,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Požadován odchod z gildy %s."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Člen pozval do gildy"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Koho byste rád pozval do gildy %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Opustit gildu?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Vytvořit gildu"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Společenství"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Pozvat"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Název gildy"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do své party."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Jméno party"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -3080,33 +3086,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později"
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -3258,23 +3264,23 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3981,40 +3987,41 @@ msgstr ""
 "chovat podivně."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Zabil vás "
+#, c-format
+msgid "You were killed by %s"
+msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4022,386 +4029,388 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) neznámé následování"
+msgstr ""
 
-#: src/localplayer.cpp:1918
-#, fuzzy, c-format
+#: src/localplayer.cpp:1925
+#, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(?) šílené pohyby"
+msgstr ""
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) útok"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr před 2x3 pole"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) away"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
-#: src/localplayer.cpp:2234
-#, fuzzy
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
-msgstr "Modifikátory hry jsou zapnuty"
+msgstr ""
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Vidíte "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4459,7 +4468,7 @@ msgstr ""
 "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
 "existuje. "
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
@@ -4475,15 +4484,19 @@ msgstr "Nesprávný účes."
 msgid "Incorrect slot."
 msgstr "Nesprávný slot."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "informaceInfo"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Postava odstraněna."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
@@ -4528,16 +4541,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "připojených uživatel: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Hra"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4627,11 +4640,11 @@ msgstr "Neznámá odpověď na pozváku do gildy."
 msgid "%s has left your guild."
 msgstr "%s opustil vaši gildu."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Byl jste vykopnut z gildy."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s byl vykopnut z vaší gildy."
@@ -4760,54 +4773,54 @@ msgstr "Půvoní heslo je nesprávné."
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "Neregistované ID."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "Platnost účtu vypršela."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Odmítnut ze serveru."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Klient je příliš starý."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Server je přelidněný."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Toto uživatelské jméno je již používáno."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
@@ -5151,7 +5164,7 @@ msgstr ""
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Síla"
 
@@ -5160,7 +5173,7 @@ msgstr "Síla"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Hbitost"
 
@@ -5169,7 +5182,7 @@ msgstr "Hbitost"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Obratnost"
 
@@ -5178,7 +5191,7 @@ msgstr "Obratnost"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalita"
 
@@ -5187,7 +5200,7 @@ msgstr "Vitalita"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligence"
 
@@ -5519,50 +5532,50 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Štěstí"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
@@ -5583,140 +5596,47 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Útok %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrana %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Neznámý předmět"
-
-#~ msgid "(?) move"
-#~ msgstr "(?) pohyb"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) zobrazení pamy"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr " (2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/de.po b/po/de.po
index 44543b13b..14bd2763a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,17 +4,18 @@
 #
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <clos3rlook@gmail.com>, 2011.
+#   <clos3rlook@gmail.com>, 2011, 2012.
 #   <der.loisl@gmx.de>, 2011.
 #   <jack@krass.com>, 2011.
 #   <Necromong@inbox.ru>, 2011.
+# Rosemarie Tauber <horos@online.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
 "Language: de\n"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: src/actorspritemanager.cpp:1169
 msgid "Visible on map"
-msgstr ""
+msgstr "Sichtbar au der Karte"
 
 #: src/being.cpp:553
 msgid "dodge"
@@ -38,121 +39,121 @@ msgstr "verfehlt"
 #. TRANSLATORS: this away status writed in player nick
 #: src/being.cpp:1534
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
 #: src/being.cpp:1539
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Leistung"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -161,160 +162,160 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
 "oder du bist es selbst."
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Anfrage den Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Name der Gilde fehlt."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Enter aktiviert jetzt den Chat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Nachricht schließt jetzt den Chat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "unbeachtet"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
-msgstr ""
+msgstr "Feind"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Spieler erfolgreich gelöscht!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
-msgstr ""
+msgstr "Client läuft seit: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Woche"
+msgstr[1] "%d Wochen"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Stunde"
+msgstr[1] "%d Stunden"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Sekunde"
+msgstr[1] "%d Sekunden"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
-msgstr ""
+msgstr "Erstellt:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
-msgstr ""
+msgstr "Gelöscht:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -324,43 +325,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -395,7 +396,7 @@ msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Angriff"
 
@@ -414,7 +415,7 @@ msgstr "Bewegen"
 msgid "Result"
 msgstr "Resultat"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -432,21 +433,21 @@ msgstr "Preis: %s / Gesamt: %s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr ""
+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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -458,8 +459,8 @@ msgid "Quit"
 msgstr "Beenden"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Max"
 
@@ -483,14 +484,14 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -522,7 +523,7 @@ msgid "The email address entries mismatch."
 msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Passwort ändern"
 
@@ -586,10 +587,10 @@ msgstr "Frisur:"
 
 #: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
-msgstr ""
+msgstr "Rasse:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Erstellen"
 
@@ -631,47 +632,47 @@ msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 msgid "Account and Character Management"
 msgstr "Account- und Charakterverwaltung"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Login wechseln"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Abmelden"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
-msgstr ""
+msgstr "Falsches Passwort"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "Gebe dein Passwort ein, um den Charakter zu löschen"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
-msgstr ""
+msgstr "Gib dein Passwort ein:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Level: %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(leer)"
 
@@ -745,12 +746,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -780,7 +781,7 @@ msgstr "Karte"
 
 #: src/gui/debugwindow.cpp:73
 msgid "Target"
-msgstr ""
+msgstr "Ziel"
 
 #: src/gui/debugwindow.cpp:74
 msgid "Net"
@@ -818,7 +819,7 @@ msgstr ""
 #: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
 #: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
-msgstr ""
+msgstr "Anzahl aktiver Mapobjekte:"
 
 #: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
@@ -882,39 +883,39 @@ msgstr ""
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:351
 msgid "Minimal hit:"
-msgstr ""
+msgstr "Minimaler Treffer"
 
 #: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:352
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Maximaler Treffer"
 
 #: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
 #: src/gui/debugwindow.cpp:353
 msgid "Critical hit:"
-msgstr ""
+msgstr "Kritischer Treffer"
 
 #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
 #: src/gui/debugwindow.cpp:395
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "Eingehend: %d bytes/s"
 
 #: src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Out: %d bytes/s"
-msgstr ""
+msgstr "Ausgehend: %d bytes/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Wusstest du schon?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Schließen"
@@ -942,8 +943,8 @@ msgstr "Ausrüstung"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Ablegen"
 
@@ -985,26 +986,26 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Aufteilen"
 
@@ -1018,17 +1019,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Aufbewahren"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1080,7 +1081,7 @@ msgstr "Gewicht: %s"
 
 #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr ""
+msgstr "Besiegte Gegner Statistik"
 
 #: src/gui/killstats.cpp:67
 msgid "Reset stats"
@@ -1093,7 +1094,7 @@ msgstr "Timer zurücksetzen"
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Level: %d bei %f%%"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
@@ -1155,12 +1156,12 @@ msgstr ""
 #: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "Zeit bis zum nächsten Level: %s"
 
 #: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:370
 msgid "jacko spawning"
@@ -1213,15 +1214,15 @@ msgstr "Wechsle den Server"
 
 #: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
-msgstr ""
+msgstr "Gesunfheits Balken"
 
 #: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr ""
+msgstr "Mana Balken"
 
 #: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
-msgstr ""
+msgstr "Erfahrungs Balken"
 
 #: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
@@ -1229,53 +1230,49 @@ msgstr ""
 
 #: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr ""
+msgstr "Gewichts Balken"
 
 #: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
-msgstr ""
+msgstr "Inventar Steckplatz Balken"
 
 #: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr ""
+msgstr "Geld Balken"
 
 #: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
-msgstr ""
+msgstr "Pfeile Balken"
 
 #: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr ""
+msgstr "Status Balken"
 
 #: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Muss"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Warte auf Server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Absenden"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Frei"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Nach:"
@@ -1294,6 +1291,7 @@ msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
@@ -1349,7 +1347,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr ""
+msgstr "Als Feind setzen"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1361,7 +1359,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709
 #: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722
 msgid "Erase"
-msgstr ""
+msgstr "Löschen"
 
 #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
 #: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187
@@ -1377,7 +1375,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
@@ -1389,11 +1387,11 @@ msgstr "Folgen"
 #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
 #: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Imitation"
-msgstr ""
+msgstr "Imitation"
 
 #: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
 msgid "Invite to party"
-msgstr ""
+msgstr "Lade ein zu Party"
 
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
 #: src/gui/popupmenu.cpp:774
@@ -1429,9 +1427,9 @@ msgid "Show Items"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
-msgstr ""
+msgstr "Ausziehen"
 
 #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301
 #: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741
@@ -1442,12 +1440,12 @@ msgstr "Kommentar hinzufügen"
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
 #: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
 msgid "Buy (?)"
-msgstr ""
+msgstr "Kaufen(?)"
 
 #: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
 #: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Sell (?)"
-msgstr ""
+msgstr "Verkaufen(?)"
 
 #: src/gui/popupmenu.cpp:312
 msgid "Kick"
@@ -1455,7 +1453,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:323
 msgid "Remove from attack list"
-msgstr ""
+msgstr "Entferne aus Angriffsliste"
 
 #: src/gui/popupmenu.cpp:328
 msgid "Add to priority attack list"
@@ -1463,11 +1461,11 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:330
 msgid "Add to attack list"
-msgstr ""
+msgstr "Hinzufügen zur Angriffsliste"
 
 #: src/gui/popupmenu.cpp:332
 msgid "Add to ignore list"
-msgstr ""
+msgstr "Hinzufügen zur Ignorierenliste"
 
 #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
 msgid "Add name to chat"
@@ -1481,30 +1479,30 @@ msgstr "Spieler"
 msgid "Pick up"
 msgstr "Aufheben"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
 #: src/gui/popupmenu.cpp:566
 msgid "Map Item"
-msgstr ""
+msgstr "Karteneinstellung"
 
 #: src/gui/popupmenu.cpp:567
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Entfernen"
 
 #: src/gui/popupmenu.cpp:573
 msgid "Warp"
-msgstr ""
+msgstr "Warp"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
+msgid "Clear outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
@@ -1533,128 +1531,128 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:642
 msgid "Remove name"
-msgstr ""
+msgstr "Lösche Name"
 
 #: src/gui/popupmenu.cpp:644
 msgid "Enable away"
-msgstr ""
+msgstr "Aktiviere abwesend"
 
 #: src/gui/popupmenu.cpp:646
 msgid "Disable away"
-msgstr ""
+msgstr "Deaktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Verlassen"
 
 #: src/gui/popupmenu.cpp:654
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Kopiere in die Zwischenablage"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Name:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
-msgstr ""
+msgstr "Spieler Kommentar "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
-msgstr ""
+msgstr "Kommentar: "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
-msgstr ""
+msgstr "Zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
-msgstr ""
+msgstr "10 zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
-msgstr ""
+msgstr "Die hälfte zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
-msgstr ""
+msgstr "Allles zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
-msgstr ""
+msgstr "Lade alte Tastenkombinationen für Objekte"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
-msgstr ""
+msgstr "Lade alte Tastenkombinationen zum fallen Lassen"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
-msgstr ""
+msgstr "Verstecken"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
-msgstr ""
+msgstr "Zeigen"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
-msgstr ""
+msgstr "Setze gelben Balken zurück"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
-msgstr ""
+msgstr "Kopiere zu Chat"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
-msgstr ""
+msgstr "(normal)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr ""
 
@@ -1704,7 +1702,7 @@ msgstr "Wähle deinen Server"
 
 #: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
 #: src/gui/serverdialog.cpp:253
 msgid "Port:"
@@ -1712,7 +1710,7 @@ msgstr "Port:"
 
 #: src/gui/serverdialog.cpp:257
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
 #: src/gui/serverdialog.cpp:271
 msgid "Server type:"
@@ -1751,11 +1749,11 @@ msgstr "Download wird vorbereitet"
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -1824,7 +1822,7 @@ msgstr "Zeige Chatfarben-Liste"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "Befehle"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1900,7 +1898,7 @@ msgstr "Zeit"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "Benutze lokale Zeit"
 
 #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
 msgid "Other"
@@ -2047,7 +2045,7 @@ msgstr "Angriffsziele der Monster einkreisen"
 
 #: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
-msgstr ""
+msgstr "Zeige Warp Partikel"
 
 #: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
@@ -2063,7 +2061,7 @@ msgstr "Angriffsbereich des Spielers hervorheben"
 
 #: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "Zeige erweiterte Minikarte"
 
 #: src/gui/setup_other.cpp:81
 msgid "Draw path"
@@ -2115,7 +2113,7 @@ msgstr "Eigenen HP-Balken anzeigen"
 
 #: src/gui/setup_other.cpp:117
 msgid "Enable quick stats"
-msgstr ""
+msgstr "Aktiviere schnelleres Aufwerten der Spelerattribute"
 
 #: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
@@ -2131,7 +2129,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr ""
+msgstr "Abwesend Nachricht"
 
 #: src/gui/setup_other.cpp:132
 msgid "Show job"
@@ -2171,7 +2169,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
-msgstr ""
+msgstr "Aktiviere Angriff trotz Verzögerung"
 
 #: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
@@ -2187,11 +2185,11 @@ msgstr "Debug-Protokoll benutzen"
 
 #: src/gui/setup_other.cpp:181
 msgid "Low traffic mode"
-msgstr ""
+msgstr "Niedriger Datenverkehr Modus"
 
 #: src/gui/setup_other.cpp:184
 msgid "Hide shield sprite"
-msgstr ""
+msgstr "Zeige das Schild nicht an"
 
 #: src/gui/setup_other.cpp:187
 msgid "Show background"
@@ -2199,7 +2197,7 @@ msgstr "Zeige Hintergrund"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Bessere Leistung (aktiviere für bessere Leistung)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
@@ -2207,7 +2205,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Hw acceleration"
-msgstr ""
+msgstr "Hw Beschleunigung"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
@@ -2219,7 +2217,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Bessere Qualität (deaktiviere für bessere Leistung)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
@@ -2319,7 +2317,7 @@ msgstr ""
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Feind"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2367,39 +2365,39 @@ msgstr "Riesig"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chinesisch(China)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Tschechisch"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Englisch"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finnisch"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Französisch"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Deutsch"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesisch"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "Polnisch"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "Japanisch"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
@@ -2407,15 +2405,15 @@ msgstr ""
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
-msgstr ""
+msgstr "Portugiesisch"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugiesisch(Brasilien)"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Russian"
-msgstr ""
+msgstr "Russisch"
 
 #: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
@@ -2431,7 +2429,7 @@ msgstr "GUI Theme"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "Sprache"
 
 #: src/gui/setup_theme.cpp:195
 msgid "Main Font"
@@ -2447,7 +2445,7 @@ msgstr "Schrift von Spieleraktionen"
 
 #: src/gui/setup_theme.cpp:198
 msgid "Help font"
-msgstr ""
+msgstr "Hilfe Schriftart"
 
 #: src/gui/setup_theme.cpp:199
 msgid "Secure font"
@@ -2455,7 +2453,7 @@ msgstr ""
 
 #: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
-msgstr ""
+msgstr "Japanische Schrift"
 
 #: src/gui/setup_theme.cpp:237
 msgid "Font size"
@@ -2599,7 +2597,7 @@ msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
-msgstr ""
+msgstr "Wechsle zu OpenGL"
 
 #: src/gui/setup_video.cpp:515
 msgid "Applying change to OpenGL requires restart."
@@ -2627,7 +2625,7 @@ msgstr ""
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "Partikeleffekteinstellungen wurden verändert"
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
@@ -2688,12 +2686,12 @@ msgstr "Fähigkeitspunkte verfügbar: %d"
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
-msgstr ""
+msgstr "Fähigkeiten Tab %d"
 
 #: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
-msgstr ""
+msgstr "Fähigkeit %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2703,196 +2701,206 @@ msgstr "Lvl: %d"
 #: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
-msgstr ""
+msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilde"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s einladen."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Gilde %s Ausstieg angefragt,"
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Lade Mitglied in die Gilde ein."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wenn willst du in die Gilde %s einladen?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Guilde verlassen?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s zur Party einladen."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Partie %s Auflösung beauftragt."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "Lade Mitglied in die Party ein."
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wenn willst du zur Party %s einladen?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Partie verlassen?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Party %s verlassen willst?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Party erstellen"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Sozial"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Guildeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Guildeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Party \"%s\""
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Anfrage für eine Party erhalten, es wurde schoneinmal angefragt."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Party %s eingeladen."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Partyname"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Name deiner Party wählen."
 
@@ -2936,7 +2944,7 @@ msgstr "Job:"
 #: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
-msgstr ""
+msgstr "Charakterpunkte: %d"
 
 #: src/gui/statuswindow.cpp:269
 #, c-format
@@ -2946,7 +2954,7 @@ msgstr "Level: %d (GM %d)"
 #: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
-msgstr ""
+msgstr "Korrekturpunkte: %d"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
@@ -2986,7 +2994,7 @@ msgstr "Astralmagie"
 
 #: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr ""
+msgstr "Kommando Editor"
 
 #: src/gui/textcommandeditor.cpp:185
 msgid "magic"
@@ -3014,7 +3022,7 @@ msgstr "Mana:"
 
 #: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
-msgstr ""
+msgstr "Art des Anvisierens:"
 
 #: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
@@ -3030,7 +3038,7 @@ msgstr "Magieschule:"
 
 #: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
-msgstr ""
+msgstr "Schul-Level"
 
 #: src/gui/textcommandeditor.cpp:238
 msgid "Save"
@@ -3059,7 +3067,7 @@ msgstr "Handel: Du"
 #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "Du bekommst %s"
 
 #: src/gui/tradewindow.cpp:112
 msgid "You give:"
@@ -3084,33 +3092,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1 Du versuchts es später erneut."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Fertig"
 
@@ -3120,19 +3128,19 @@ msgstr "Aktionen"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr ""
+msgstr "Namen der Freunde"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Außer Acht gelassene Namen"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr ""
+msgstr "Ignorierte Namen"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr ""
+msgstr "Gelöschte Namen"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3152,19 +3160,19 @@ msgstr "NPCs"
 
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
-msgstr ""
+msgstr "Monster HP Leiste"
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
-msgstr ""
+msgstr "Monster HP Leiste (zweite Farbe)"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr ""
+msgstr "Mitglieder der Party"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr ""
+msgstr "Mitglieder der Gilde"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3180,15 +3188,15 @@ msgstr "Anzeige der Erfahrungspunkte"
 
 #: src/gui/userpalette.cpp:134
 msgid "Player HP bar"
-msgstr ""
+msgstr "HP-Leiste des Spielers"
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
-msgstr ""
+msgstr "HP-Leiste des Spielers (zweite Farbe)"
 
 #: src/gui/userpalette.cpp:137
 msgid "Player Hits Monster"
-msgstr ""
+msgstr "Spieler trifft Monster"
 
 #: src/gui/userpalette.cpp:138
 msgid "Monster Hits Player"
@@ -3196,7 +3204,7 @@ msgstr "Monster trifft Spieler"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "Ein Spieler hat dich getroffen"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3204,15 +3212,15 @@ msgstr "Kritischer Treffer"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "Spieler trifft Monster"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "Spieler trifft Monster stark"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
-msgstr ""
+msgstr "Spieler trifft nicht"
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
@@ -3220,7 +3228,7 @@ msgstr "Verfehlt"
 
 #: src/gui/userpalette.cpp:149
 msgid "Portal Highlight"
-msgstr ""
+msgstr "Portal hervorheben"
 
 #: src/gui/userpalette.cpp:151
 msgid "Default collision Highlight"
@@ -3236,7 +3244,7 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:157
 msgid "Walkable Highlight"
-msgstr ""
+msgstr "Betretbarer Boden"
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3248,11 +3256,11 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "Monster Angriffsreichweite"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
-msgstr ""
+msgstr "Stammplatz"
 
 #: src/gui/userpalette.cpp:167
 msgid "Home Place Border"
@@ -3260,31 +3268,31 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:169
 msgid "Road Point"
-msgstr ""
+msgstr "Wegpunkt"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Wer ist Online - Aktualisiere"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
-msgstr ""
+msgstr "Aktualisierung"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Wer ist Online -"
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Wer ist Online - Fehler"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Wer ist Online - Aktualisiere"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
-msgstr ""
+msgstr "Kampf"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
@@ -3384,21 +3392,21 @@ msgstr "Globale Ansage von %s:"
 #: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s flüstert: %s"
 
 #: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
 #: src/net/ea/gui/partytab.cpp:83
 msgid "Command: /invite <nick>"
-msgstr ""
+msgstr "Befehl:/invite<nick>"
 
 #: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
 msgid "This command invites <nick> to the guild you're in."
-msgstr ""
+msgstr "Dieser Befehl lädt <nick> in deine Gilde ein."
 
 #: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
 #: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /leave"
-msgstr ""
+msgstr "Befehl:/leave"
 
 #: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
 msgid "This command causes the player to leave the guild."
@@ -3447,7 +3455,7 @@ msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Befehl:/ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
@@ -3463,23 +3471,23 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
-msgstr ""
+msgstr "BP"
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "Bot Überprüfer"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "Wer ist Online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
-msgstr ""
+msgstr "BGS"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
@@ -3515,19 +3523,19 @@ msgstr "SOZ"
 
 #: src/gui/windowmenu.cpp:94
 msgid "SH"
-msgstr ""
+msgstr "TK"
 
 #: src/gui/windowmenu.cpp:94
 msgid "Shortcuts"
-msgstr ""
+msgstr "Tastenkürzel"
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
-msgstr ""
+msgstr "ZS"
 
 #: src/gui/windowmenu.cpp:97
 msgid "DR"
-msgstr ""
+msgstr "WW"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
@@ -3535,11 +3543,11 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Wusstest du schon"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "EINST"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
@@ -3551,11 +3559,11 @@ msgstr "Login ändern"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr ""
+msgstr "Wähle Welt"
 
 #: src/inventory.cpp:251
 msgid "Storage"
-msgstr ""
+msgstr "Lager"
 
 #: src/inventory.cpp:253
 msgid "Cart"
@@ -3587,7 +3595,7 @@ msgstr "Zielen & Angreifen"
 
 #: src/keyboardconfig.cpp:52
 msgid "Move to Target"
-msgstr ""
+msgstr "Gehe zu Ziel"
 
 #: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
@@ -3595,11 +3603,11 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
-msgstr ""
+msgstr "Gehe zu Stammplatz"
 
 #: src/keyboardconfig.cpp:58
 msgid "Set home location"
-msgstr ""
+msgstr "Setzte Stammplatz"
 
 #: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
@@ -3651,7 +3659,7 @@ msgstr "Handeln erlauben/verbieten"
 
 #: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Wechsle Ansichtsmodus der Karte"
 
 #: src/keyboardconfig.cpp:82
 msgid "Select OK"
@@ -3682,7 +3690,7 @@ msgstr "Kurztaste %d"
 
 #: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
-msgstr ""
+msgstr "Fenster Tasten"
 
 #: src/keyboardconfig.cpp:129
 msgid "Help Window"
@@ -3726,7 +3734,7 @@ msgstr "Debugfenster"
 
 #: src/keyboardconfig.cpp:149
 msgid "Social Window"
-msgstr ""
+msgstr "Gesellschaftsfenster"
 
 #: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
@@ -3734,47 +3742,47 @@ msgstr "Kurztasten für Gefühle"
 
 #: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
-msgstr ""
+msgstr "Kleidungs Fenster"
 
 #: src/keyboardconfig.cpp:155
 msgid "Shop Window"
-msgstr ""
+msgstr "Kauf Fenster"
 
 #: src/keyboardconfig.cpp:157
 msgid "Quick drop Window"
-msgstr ""
+msgstr "Schnelles wegwerfen Fenster"
 
 #: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
-msgstr ""
+msgstr "Besiegte Gegner Fenster"
 
 #: src/keyboardconfig.cpp:161
 msgid "Commands Window"
-msgstr ""
+msgstr "Befehls Fenster"
 
 #: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
-msgstr ""
+msgstr "Bot Prüfer Fenster"
 
 #: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
-msgstr ""
+msgstr "Wer ist Online Fenster"
 
 #: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
-msgstr ""
+msgstr "Wusstest du schon Fenster"
 
 #: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "Vorheriger Gesellschaftstab"
 
 #: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
-msgstr ""
+msgstr "Nächster Gesellschaftstab"
 
 #: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr ""
+msgstr "Emotons Tasten"
 
 #: src/keyboardconfig.cpp:176
 msgid "Smilie"
@@ -3825,7 +3833,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
-msgstr ""
+msgstr "Chat Tasten"
 
 #: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
@@ -3849,7 +3857,7 @@ msgstr "Nächster Tab"
 
 #: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Schließe aktuellen Tab"
 
 #: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
@@ -3865,11 +3873,11 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
-msgstr ""
+msgstr "Deaktiviere Chateingabe"
 
 #: src/keyboardconfig.cpp:299
 msgid "Other Keys"
-msgstr ""
+msgstr "Andere Tasten"
 
 #: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
@@ -3897,7 +3905,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
-msgstr ""
+msgstr "Verrückte Bewegungen"
 
 #: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
@@ -3921,15 +3929,15 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
-msgstr ""
+msgstr "Benutze #itenplz Spruch"
 
 #: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
-msgstr ""
+msgstr "Benutze magische Angriff"
 
 #: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
-msgstr ""
+msgstr "Wechsle magische Angriff"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
@@ -3937,7 +3945,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
-msgstr ""
+msgstr "Wechsle die Bewegungsart"
 
 #: src/keyboardconfig.cpp:332
 msgid "Change Attack Weapon Type"
@@ -3945,27 +3953,27 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:334
 msgid "Change Attack Type"
-msgstr ""
+msgstr "Wechsle Angriffsart"
 
 #: src/keyboardconfig.cpp:336
 msgid "Change Follow mode"
-msgstr ""
+msgstr "Wechle Folgenmodus"
 
 #: src/keyboardconfig.cpp:338
 msgid "Change Imitation mode"
-msgstr ""
+msgstr "Wechsle Imitierenmodus"
 
 #: src/keyboardconfig.cpp:341
 msgid "Disable / Enable Game modifier keys"
-msgstr ""
+msgstr "Aktiviere / Deaktiviere Spielmodifikations Tasten"
 
 #: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
-msgstr ""
+msgstr "An/Aus Audio"
 
 #: src/keyboardconfig.cpp:344
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "Aktiviere/Deaktiviere abwesend Modus"
 
 #: src/keyboardconfig.cpp:346
 msgid "Emulate right click from keyboard"
@@ -3985,428 +3993,435 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
+"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
+"das Spiel lässt sich nicht richtig steuern."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr ""
+#, c-format
+msgid "You were killed by %s"
+msgstr "Du wurdest von einem %s getötet"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
-msgstr ""
+msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
-msgstr ""
+msgstr "Gegenstand ist zu schwer"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
-msgstr ""
+msgstr "Gegenstand ist zu weit weg."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
-msgstr ""
+msgstr "Inventar ist voll"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
-msgstr ""
+msgstr "Stapel ist zu groß"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "Gegenstand gehört jemand anderem"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben."
+msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) normale Bewegungen"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) bewegungen umkehren"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) verrückte Bewegung"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
-msgstr ""
+msgstr "(?) Angriff"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) Normaler Angriff"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) gehe und greife an"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) gehe, greife an, hebe auf"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) ohne automatischen Angriff"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) kleine aufhebe Zelle 1x1"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) normale aufhebe Zelle 2x1"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
-msgstr ""
+msgstr "(?) aufheben"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) Normale Kartenansicht"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) Debug Kartenansicht"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) Ultra Kartenansicht"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) Ultra Kartenansicht 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) Leere Kartenansicht"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) Schwarz-Weiß Kartenansicht"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) benutze #flar als magischen Angriff"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) benutze #chiza als magischen Angriff"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) benutze #ingrav als magischen Angriff"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) benutze #frillyar als magischen Angriff"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) benutze #upmarmu als magischen Angriff"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) magischer Angriff"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) greife keine Spieler an"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) normale Imitation"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
-msgstr ""
+msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) Anwesend"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
-msgstr ""
+msgstr "(A) Abwesend"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
-msgstr ""
+msgstr "(?) Abwesend"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
-msgstr ""
+msgstr "Spielmodifikatoren sind aktiviert"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
-msgstr ""
+msgstr "Spielmodifikatoren sind deaktiviert"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
-msgstr ""
+msgstr "Folgen abgebrochen"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Du siehst"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
-msgstr ""
+msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "-l --log-file : Log Datei benutzen"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "  -L --chat-log-dir   : Verzeichnis für die Chat Log"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  - --help : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+msgstr "  -C --config-dir     : zu benutzendes Einstellungsverueichniss"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port des Loginservers"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
-msgstr ""
+msgstr "     --update-host    : Benutzt diesen Aktualisierungs Host"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr "     --screenshot-dir : Verzeichnis um Bildschirmfotos zu speichern"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
+msgstr "--safemode : Starte das Spiel im sicheren Modus"
+
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "--no-opengl : Deaktiviere OpenGL für diese Sitzung"
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
@@ -4450,17 +4465,17 @@ msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
-msgstr ""
+msgstr "Kann diese ID nicht verwenden."
 
 #: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
-msgstr ""
+msgstr "Unbekannter char-server Fehler"
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Falscher Name."
 
@@ -4476,15 +4491,19 @@ msgstr ""
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Falsche Rasse"
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
-msgstr ""
+msgstr "Charakter gelöscht"
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4529,16 +4548,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "Benutzer Online: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Spiel"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4548,7 +4567,7 @@ msgstr "Gilde erstellt."
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr ""
+msgstr "Du bist bereits in der Gilde"
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
@@ -4561,22 +4580,22 @@ msgstr ""
 #: src/net/ea/guildhandler.cpp:180
 #, c-format
 msgid "Guild name: %s"
-msgstr ""
+msgstr "Gildenname: %s"
 
 #: src/net/ea/guildhandler.cpp:182
 #, c-format
 msgid "Guild master: %s"
-msgstr ""
+msgstr "Gilden Meister: %s"
 
 #: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
-msgstr ""
+msgstr "Gilden Level: %d"
 
 #: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
-msgstr ""
+msgstr "Mitglieder Online: %d"
 
 #: src/net/ea/guildhandler.cpp:187
 #, c-format
@@ -4605,7 +4624,7 @@ msgstr ""
 
 #: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "Kann Spieler nicht in die Gilde einladen."
 
 #: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
@@ -4626,28 +4645,28 @@ msgstr ""
 #: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%s hat Ihre Gilde verlassen."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr ""
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Du wurdest aus der Gilde rausgeworfen"
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%s wurde aus Ihrer Gilde geworfen."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr ""
+msgstr "/invite Lade einen Spieler in deine Party ein"
 
 #: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr ""
+msgstr "/leave > verlasse die Party in der du bist"
 
 #: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr ""
+msgstr "/kick > werfen jemanden aus deiner Gilde raus"
 
 #: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
@@ -4681,7 +4700,7 @@ msgstr ""
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
-msgstr ""
+msgstr "Befehl: /item"
 
 #: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
@@ -4703,7 +4722,7 @@ msgstr ""
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
-msgstr ""
+msgstr "Befehl:/exp"
 
 #: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
@@ -4747,7 +4766,7 @@ msgstr ""
 
 #: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
-msgstr ""
+msgstr "Kann nicht Ausrüsten."
 
 #: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
@@ -4761,54 +4780,54 @@ msgstr "Altes Passwort fehlerhaft"
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Unbekannter Fehler"
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "Unbekannte ID"
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "Account abgelaufen."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
-msgstr ""
+msgstr "Client zu alt"
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
-msgstr ""
+msgstr "Dieser Benutzername ist bereits in Verwendung"
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr ""
 
@@ -4838,7 +4857,7 @@ msgstr ""
 #: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
-msgstr ""
+msgstr "%s ist nun ein Mitglied deiner Party"
 
 #: src/net/ea/partyhandler.cpp:189
 #, c-format
@@ -4852,17 +4871,17 @@ msgstr ""
 
 #: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
-msgstr ""
+msgstr "Du hast die Party verlassen"
 
 #: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
-msgstr ""
+msgstr "%s hat deine Party verlassen"
 
 #: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr ""
+msgstr "Ein unbekanntes Mitglied hat versucht zu sagen: %s"
 
 #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
@@ -4887,7 +4906,7 @@ msgstr "Game Over!"
 
 #: src/net/ea/playerhandler.cpp:102
 msgid "Insert coin to continue."
-msgstr ""
+msgstr "Werfe eine Münze ein um Weiterzuspielen."
 
 #: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
 msgid ""
@@ -4934,11 +4953,11 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
-msgstr ""
+msgstr "Du bist nicht Tod, du ruhst dich nur aus."
 
 #: src/net/ea/playerhandler.cpp:121
 msgid "You are no more."
-msgstr ""
+msgstr "Du bit tot."
 
 #: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
@@ -4946,7 +4965,7 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "Deine Zeit ist abgelaufen. Zeit deinem Schöpfer gegenüberzutreten."
 
 #: src/net/ea/playerhandler.cpp:124
 msgid "You're a stiff."
@@ -4954,19 +4973,21 @@ msgstr "Du bist eine Leiche."
 
 #: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
-msgstr ""
+msgstr "Deines Lebens beraubt, ruhst du in Frieden."
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
+"Wenn sie nicht so unvorsichtig gewesen währen, könnten sie die Radischen "
+"noch von oben sehen."
 
 #: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "Deine metabolischen Prozesse sind nun Geschichte."
 
 #: src/net/ea/playerhandler.cpp:128
 msgid "You're off the twig."
-msgstr ""
+msgstr "Du bist weg vom Fenster."
 
 #: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
@@ -4980,11 +5001,11 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
-msgstr ""
+msgstr "Du bist ein Ex-Spieler"
 
 #: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Du schmachst an den Fjorden"
 
 #: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
 #: src/net/ea/playerhandler.cpp:427
@@ -4995,6 +5016,8 @@ msgstr "Nachricht"
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
+"Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine "
+"Gesundheit nicht mehr regenerieren."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5003,7 +5026,7 @@ msgstr ""
 #: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "Du hast %s aufgehoben."
 
 #: src/net/ea/playerhandler.cpp:459
 #, c-format
@@ -5012,27 +5035,27 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Kann diese Fähigkeit nicht aufwerten!"
 
 #: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
-msgstr ""
+msgstr "Rüste dich erst mit Pfeilen aus."
 
 #: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
-msgstr ""
+msgstr "Handeln Fehlgeschlagen"
 
 #: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
-msgstr ""
+msgstr "Emotion fehlgeschlagen"
 
 #: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
-msgstr ""
+msgstr "Sitzen Fehlgeschlagen"
 
 #: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Chat starten fehlgeschlagen."
 
 #: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
@@ -5044,7 +5067,7 @@ msgstr ""
 
 #: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Du hast noch ein zu niedriges Level!"
 
 #: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
@@ -5056,39 +5079,39 @@ msgstr ""
 
 #: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
-msgstr ""
+msgstr "Du hast keine Erinnerungen!"
 
 #: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
-msgstr ""
+msgstr "Das kannst du im moment nicht machen!"
 
 #: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
-msgstr ""
+msgstr "Sieht aus, als ob du mehr Geld brauchst....;-)"
 
 #: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr ""
+msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
 
 #: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
-msgstr ""
+msgstr "Du brauchst ein weiteres rotes Juwel"
 
 #: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
-msgstr ""
+msgstr "Du brauchst ein weiteres blaues Juwel"
 
 #: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Du trägst zu viel mit dir herum um das zu tun!"
 
 #: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Huh? Was ist das?"
 
 #: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
-msgstr ""
+msgstr "Warp fehlgeschlagen..."
 
 #: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
@@ -5105,25 +5128,25 @@ 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 ""
+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 ""
+msgstr "Handeln nicht möglich. Handelspartner existiert nicht."
 
 #: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
-msgstr ""
+msgstr "Handeln abgebrochen durch eine unbekannte Ursache."
 
 #: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
-msgstr ""
+msgstr "Handeln: Du und %s"
 
 #: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr ""
+msgstr "Handel mit %s abgebrochen"
 
 #: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
@@ -5136,14 +5159,18 @@ msgstr ""
 #: 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 ""
+msgstr "Gegenstand hinzufügen aus unbekannten Gründen fehlgeschlagen."
 
 #: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
@@ -5153,50 +5180,50 @@ msgstr "Handel abgebrochen."
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Stärke"
 
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr ""
+msgstr "Stärke %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Beweglichkeit"
 
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr ""
+msgstr "Beweglichkeit %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Ausdauer"
 
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr ""
+msgstr "Geschicklichkeit %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Gesundheit"
 
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr ""
+msgstr "Gesunfheit %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligenz"
 
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr ""
+msgstr "Intelligenz %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
@@ -5205,7 +5232,7 @@ msgstr "Willenskraft:"
 #: src/net/manaserv/attributes.cpp:232
 #, c-format
 msgid "Willpower %+.1f"
-msgstr ""
+msgstr "Willenskraft %+.1f"
 
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
@@ -5258,7 +5285,7 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
-msgstr ""
+msgstr "Falsche Slotnummer"
 
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
@@ -5266,12 +5293,12 @@ msgstr "Spieler gelöscht"
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr ""
+msgstr "Auswahl außer Reichweite"
 
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "Unbekannter Fehler (%d)."
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -5460,7 +5487,7 @@ msgstr ""
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "Es ist nicht möglich einen unverkäuflichen Gegenstand zu verkaufen."
 
 #: src/net/tmwa/generalhandler.cpp:108
 #, c-format
@@ -5524,52 +5551,52 @@ msgstr "Unbekannter Verbindungsfehler"
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Glück"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Verteidigung:"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
-msgstr ""
+msgstr "Angriffs Verzögerung"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
-msgstr ""
+msgstr "Angriffsreichweite"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
-msgstr ""
+msgstr "Schaden pro Sek."
 
 #: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
@@ -5588,47 +5615,47 @@ msgstr "Verbindung mit Server abgebrochen. "
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Drucke '..'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Blinkender Name"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Schwebende '...' Blase"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Angriff %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Verteidigung %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
diff --git a/po/es.po b/po/es.po
index d19ec01ee..8d3ecbf6c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,16 +5,16 @@
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
-# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
+# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011, 2012.
 # Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
 # Nelson  <nelson6eeduardo65@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-20 19:51+0000\n"
-"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
 "Language: es\n"
@@ -45,113 +45,113 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +160,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:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Falta el nombre del Clan."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr "en la lista negra"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr "enemigo"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
-msgstr "Tám. caché:"
+msgstr "Tam. caché:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -323,43 +323,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -394,7 +394,7 @@ msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
@@ -413,7 +413,7 @@ msgstr "Mover"
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -436,16 +436,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -457,8 +457,8 @@ msgid "Quit"
 msgstr "Salir"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Máximo"
 
@@ -482,20 +482,20 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
-msgstr "Cambiar e-mail"
+msgstr "Cambiar Dirección de Correo electrónico"
 
 #: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
@@ -504,24 +504,24 @@ msgstr "Cuenta: %s"
 
 #: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "Escribe el nuevo email dos veces:"
+msgstr "Escribe el nuevo correo dos veces:"
 
 #: src/gui/changeemaildialog.cpp:132
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "El nuevo email debe tener como mínimo %d caracteres."
+msgstr "El nuevo correo debe tener como mínimo %d caracteres."
 
 #: src/gui/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "El nuevo email debe tener como máximo %d caracteres."
+msgstr "El nuevo correo debe tener como máximo %d caracteres."
 
 #: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr "Los e-mail son distintos."
+msgstr "Los correos ingresados no concuerdan."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
@@ -577,7 +577,7 @@ msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
-msgstr "Color:"
+msgstr "Color de cabello:"
 
 #: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
@@ -587,27 +587,27 @@ msgstr "Peinado:"
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Crear"
 
 #: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
-msgstr "Hombre"
+msgstr "Masculino"
 
 #: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
-msgstr "Mujer"
+msgstr "Femenino"
 
 #: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
-msgstr "Por favor distribuya %d puntos"
+msgstr "Por favor, distribuye %d puntos"
 
 #: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
-msgstr "Su nombre debe de tener como mínimo 4 caracteres."
+msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
@@ -616,7 +616,7 @@ msgstr "Atributos del personaje OK"
 #: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
-msgstr "Por favor borre %d puntos"
+msgstr "Por favor borra %d puntos"
 
 #: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
@@ -630,47 +630,47 @@ msgstr "¿Estás seguro de que deseas borrar este personaje?"
 msgid "Account and Character Management"
 msgstr "Administración de la Cuenta y los Personajes"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Volver al Login"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
-msgstr "Cambiar e-mail"
+msgstr "Cambiar Correo Electrónico"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Nivel: %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(vacío)"
 
@@ -744,12 +744,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr "Presentes: %s; %d jugadores estan presentes."
+msgstr "Presentes: %s; %d jugadores están presentes."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -856,22 +856,22 @@ msgstr "Objetivo:"
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
 #: src/gui/debugwindow.cpp:346
 msgid "Target Id:"
-msgstr "Seccionar ID:"
+msgstr "Id de Objetivo:"
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
 #: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
 msgid "Target Level:"
-msgstr "Diana de nivel:"
+msgstr "Nivel del Objetivo:"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
 #: src/gui/debugwindow.cpp:348
 msgid "Target Party:"
-msgstr "Grupo de destino:"
+msgstr "Grupo del Objetivo:"
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
 #: src/gui/debugwindow.cpp:349
 msgid "Target Guild:"
-msgstr "Target Guild:"
+msgstr "Clan del Objetivo:"
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
 #: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
@@ -901,19 +901,19 @@ msgstr "Ping: %s ms"
 #: src/gui/debugwindow.cpp:395
 #, c-format
 msgid "In: %d bytes/s"
-msgstr "In: %d bytes/s"
+msgstr "Recibiendo: %d bytes/s"
 
 #: src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Out: %d bytes/s"
-msgstr "Out: %d bytes/s"
+msgstr "Enviando: %d bytes/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
 msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Cerrar"
@@ -941,8 +941,8 @@ msgstr "Equipamiento"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Quitárselo"
 
@@ -984,26 +984,26 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Dividir"
 
@@ -1017,17 +1017,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Tirar"
@@ -1054,7 +1054,7 @@ msgstr "Seleccione la cantidad de artículos a recuperar."
 
 #: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
-msgstr "Selecione la cantidad de objetos para dividir."
+msgstr "Seleccione la cantidad de objetos para dividir."
 
 #: src/gui/itemamountwindow.cpp:276
 msgid "Add to buy shop."
@@ -1141,13 +1141,13 @@ msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
 #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
-msgstr "Exp de último monstruo eliminado:"
+msgstr "Exp de último eliminado:"
 
 #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
 #: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
-msgstr "Tiempo antes de que jacko desove:"
+msgstr "Tiempo antes de que jacko aparezca:"
 
 #: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
 #: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
@@ -1163,7 +1163,7 @@ msgstr "¿%s %d?"
 
 #: src/gui/killstats.cpp:370
 msgid "jacko spawning"
-msgstr "desove de jacko"
+msgstr "jacko apareciendo"
 
 #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
 msgid "You have left the guild."
@@ -1183,7 +1183,7 @@ msgstr "Saltar"
 
 #: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
-msgstr "Login"
+msgstr "Inicio de sesión"
 
 #: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
 #: src/gui/widgets/chattab.cpp:173
@@ -1240,7 +1240,7 @@ msgstr "barra de dinero"
 
 #: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
-msgstr "Barra de flechas"
+msgstr "barra de flechas"
 
 #: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
@@ -1250,31 +1250,27 @@ msgstr "barra de estado"
 msgid "Need"
 msgstr "Necesitas"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Esperando al servidor"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Dejar de esperar"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Siguiente"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Para:"
@@ -1293,6 +1289,7 @@ msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1348,7 +1345,7 @@ msgstr "Lista negra"
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr "Establecer como enemigo"
+msgstr "Fijar como enemigo"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1376,7 +1373,7 @@ msgstr "Des-ignorar"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1428,7 +1425,7 @@ msgid "Show Items"
 msgstr "Mostrar artículos"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Desvestir"
 
@@ -1480,8 +1477,8 @@ msgstr "Jugadores"
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
@@ -1493,8 +1490,8 @@ msgstr "Mapa Objeto"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1503,8 +1500,8 @@ msgid "Warp"
 msgstr "Deformar"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Cargar conjuntos antiguos"
+msgid "Clear outfit"
+msgstr "Limpiar vestimenta"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1542,119 +1539,118 @@ msgstr "Habilitar ausencia"
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Dejar"
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Copiar al chat"
+msgstr "Copiar al portapapeles"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Cambiar posición del Clan"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
-msgstr "Nombre:"
+msgstr "Nombre:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
-msgstr "Agredar al intercambio"
+msgstr "Agregar al intercambio"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
-msgstr "Cargar atajos antiguos de soltar (drop)"
+msgstr "Cargar atajos para tirar antiguos"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Bajar"
 
@@ -1672,7 +1668,7 @@ msgstr "Confirmar:"
 
 #: src/gui/register.cpp:108
 msgid "Email:"
-msgstr "Email:"
+msgstr "Correo:"
 
 #: src/gui/register.cpp:176
 #, c-format
@@ -1700,7 +1696,7 @@ msgstr "Las contraseñas no coinciden."
 
 #: src/gui/serverdialog.cpp:237
 msgid "Choose Your Server"
-msgstr "Escoja tu servidor"
+msgstr "Escoge  tu servidor"
 
 #: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
@@ -1749,13 +1745,13 @@ msgstr "Preparando la descarga"
 
 #: src/gui/serverdialog.cpp:573
 msgid "Error retreiving server list!"
-msgstr "Error al recuperar la lista de servers!"
+msgstr "¡Error al recuperar la lista de servidores!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
-msgstr "requiere una version mas nueva"
+msgstr "requiere una versión mas nueva"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -1790,7 +1786,7 @@ msgstr "Audio"
 
 #: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
-msgstr "Volumen Sfx"
+msgstr "Volumen de sfx"
 
 #: src/gui/setup_audio.cpp:65
 msgid "Music volume"
@@ -1934,7 +1930,7 @@ msgstr "Pulso"
 #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
 #: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
-msgstr "Arcoiris"
+msgstr "Arco iris"
 
 #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
 #: src/gui/setup_colors.cpp:409
@@ -1959,7 +1955,7 @@ msgstr "Azul:"
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
-msgstr "Alpha:"
+msgstr "Alfa:"
 
 #: src/gui/setup.cpp:71
 msgid "Apply"
@@ -2019,7 +2015,7 @@ msgstr "Conflicto de teclas detectado."
 
 #: src/gui/setup_other.cpp:39
 msgid "Misc"
-msgstr "Misceláneos"
+msgstr "Misceláneo"
 
 #: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
@@ -2035,7 +2031,7 @@ msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
 #: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
-msgstr "Resaltar el alcanze de ataque de los monstruos"
+msgstr "Resaltar el alcance de ataque de los monstruos"
 
 #: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
@@ -2063,7 +2059,7 @@ msgstr "Resaltar el alcance de ataque del jugador"
 
 #: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr "Mostrar minmapas extendidos"
+msgstr "Mostrar mini-mapas extendidos"
 
 #: src/gui/setup_other.cpp:81
 msgid "Draw path"
@@ -2091,7 +2087,7 @@ msgstr "En movimiento"
 
 #: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
-msgstr "Corrección automatica de la posición"
+msgstr "Corrección automática de la posición"
 
 #: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
@@ -2147,7 +2143,7 @@ msgstr "Habilitar el protocolo de anuncio"
 
 #: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
-msgstr "Aceptar solicitudes de compra / venta"
+msgstr "Aceptar solicitudes de compra/venta"
 
 #: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
@@ -2175,7 +2171,7 @@ msgstr "Habilitar el ataque del lado del servidor"
 
 #: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
-msgstr "Habilitar el control de robot"
+msgstr "Habilitar el control de bot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
@@ -2191,7 +2187,7 @@ msgstr "Modo de bajo tráfico"
 
 #: src/gui/setup_other.cpp:184
 msgid "Hide shield sprite"
-msgstr "Ocultar los objetos escudos"
+msgstr "Ocultar sprite protector"
 
 #: src/gui/setup_other.cpp:187
 msgid "Show background"
@@ -2231,7 +2227,7 @@ msgstr "Mostrar transparencia de criaturas"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr "Habilitar re ordenamiento de sprites."
+msgstr "Habilitar re-ordenamiento de sprites."
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
@@ -2275,7 +2271,7 @@ msgstr "Intercambios seguros"
 
 #: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
-msgstr "Carácteres inseguros en los nombres"
+msgstr "Caracteres inseguros en los nombres"
 
 #: src/gui/setup_players.cpp:78
 msgid "Show statuses"
@@ -2394,9 +2390,8 @@ msgid "Indonesian"
 msgstr "Indonesio"
 
 #: src/gui/setup_theme.cpp:153
-#, fuzzy
 msgid "Polish"
-msgstr "Inglés"
+msgstr "Polaco"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
@@ -2428,7 +2423,7 @@ msgstr "Tema"
 
 #: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
-msgstr "Tema de interfáz gráfica"
+msgstr "Tema de interfaz gráfica"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
@@ -2469,7 +2464,7 @@ msgstr "Tema cambiado"
 #: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
-msgstr "Reincie el juego para que los cambios tengan efecto."
+msgstr "Reinicia el juego para que los cambios tengan efecto."
 
 #: src/gui/setup_video.cpp:194
 msgid "Software"
@@ -2538,7 +2533,7 @@ msgstr "Mostrar aviso al coger algo"
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:295
 msgid "in chat"
-msgstr "en chat"
+msgstr "en el chat"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:297
@@ -2627,7 +2622,7 @@ msgstr "Configuración del efecto de las partículas cambiado."
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
-msgstr "Los cambios tendran efecto cuando se cambie de mapa."
+msgstr "Los cambios tendrán efecto cuando se cambie de mapa."
 
 #: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
@@ -2644,7 +2639,7 @@ msgstr "Vender artículos"
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 #: src/gui/tradewindow.cpp:89
 msgid "Add"
-msgstr "Anadir"
+msgstr "Añadir"
 
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
 msgid "Announce"
@@ -2701,196 +2696,206 @@ msgstr "Nivel: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Clan"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invita al jugador %s al clan %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Clan %s pidiendo salir."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Miembro invitado al clan."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "A quién te gustaría invitar al clan %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "¿Dejar el clan?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el clan %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grupo %s requisitado."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "¿A quién te gustaría invitar al grupo %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Navegación"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Crear Clan"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al clan de  %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al clan de %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
-msgstr "Escoja el nombre de su clan."
+msgstr "Escoge el nombre de tu clan."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado para unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado para unirte al grupo %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear un grupo. Ya estás en uno."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
-msgstr "Escoja el nombre del grupo."
+msgstr "Escoge el nombre del grupo."
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
@@ -2910,7 +2915,7 @@ msgstr "Dinero: %s"
 
 #: src/gui/statuswindow.cpp:151
 msgid "HP:"
-msgstr "PV:"
+msgstr "HP:"
 
 #: src/gui/statuswindow.cpp:158
 msgid "Exp:"
@@ -2918,7 +2923,7 @@ msgstr "Exp:"
 
 #: src/gui/statuswindow.cpp:172
 msgid "MP:"
-msgstr "PM:"
+msgstr "MP:"
 
 #: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
 #, c-format
@@ -2966,7 +2971,7 @@ msgstr "Magia de Vida"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "Magia Bélica"
+msgstr "Magia de Guerra"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
@@ -2974,7 +2979,7 @@ msgstr "Magia de Transmutación"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr "Magia de Naturaleza"
+msgstr "Magia de la Naturaleza"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
@@ -3080,33 +3085,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
-msgstr "##1 Es altamente recomendado que"
+msgstr "##1  Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
-msgstr "##1 lo intentes de nuevo más tarde."
+msgstr "##1  lo intentes de nuevo más tarde."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Completado"
 
@@ -3116,19 +3121,19 @@ msgstr "Ser"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr "Nombres de amigo"
+msgstr "Nombres de Amigos"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr "Nombres Desatendidos"
+msgstr "Nombres de Desatendidos"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr "Nombres Ignorados"
+msgstr "Nombres de Ignorados"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr "Nombres Borrados"
+msgstr "Nombres de Borrados"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3196,7 +3201,7 @@ msgstr "Otros Jugadores le pegan al Jugador Local"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
-msgstr "Golpe Critico"
+msgstr "Golpe Crítico"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
@@ -3224,11 +3229,11 @@ msgstr "Resaltar colisiones"
 
 #: src/gui/userpalette.cpp:153
 msgid "Air collision Highlight"
-msgstr "Puesta en evidencia de las colisiones: Aere"
+msgstr "Resaltado de colisión en el Aire"
 
 #: src/gui/userpalette.cpp:155
 msgid "Water collision Highlight"
-msgstr "Puesta en evidencia de las colisiones: Agua"
+msgstr "resaltado de colisión en el Agua"
 
 #: src/gui/userpalette.cpp:157
 msgid "Walkable Highlight"
@@ -3258,23 +3263,23 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3284,7 +3289,7 @@ msgstr "Batalla"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
-msgstr "/users > Listas de usuarios en el canal"
+msgstr "/users > Listar a los usuarios en el canal actual"
 
 #: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
@@ -3328,7 +3333,7 @@ msgstr "Salir del canal."
 
 #: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Si eres la última persona de este canal , será eliminado."
+msgstr "Si eres la última persona de este canal, será eliminado."
 
 #: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
@@ -3401,19 +3406,19 @@ msgstr "Este comando hace que dejes el clan."
 #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
 #: src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/help > Para la ayuda."
+msgstr "/help > Mostrar la ayuda."
 
 #: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un jugador a tu clan"
+msgstr "/invite > Invitar a un jugador a tu clan"
 
 #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Deja el clan en el que estas"
+msgstr "/leave > Dejar el clan en el que estás"
 
 #: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa a alguien del clan en el que estás."
+msgstr "/kick > Expulsar a alguien del clan en el que estás."
 
 #: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
 msgid "Edit"
@@ -3421,15 +3426,15 @@ msgstr "Editar"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignora al jugador"
+msgstr "/ignore > Ignorar a otro jugador"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Parar de ignorar al jugador"
+msgstr "/unignore > Dejar de ignorar a otro jugador"
 
 #: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
-msgstr "/close > Cierra la pestaña de mensajes"
+msgstr "/close > Cerrar la pestaña de susurro"
 
 #: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
@@ -3479,7 +3484,7 @@ msgstr "KS"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
-msgstr "Emoticones"
+msgstr "Emotíconos"
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
@@ -3587,15 +3592,15 @@ msgstr "Mover al objetivo"
 
 #: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
-msgstr "Cambiar tipos de movimientos hacia la diana"
+msgstr "Cambiar Movimiento al tipo de Objetivo"
 
 #: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
-msgstr "Mover hacia la localizacion inicial"
+msgstr "Mover hacia la localización Inicial"
 
 #: src/keyboardconfig.cpp:58
 msgid "Set home location"
-msgstr "Fijar localización de hogar"
+msgstr "Estableces la localización Inicial"
 
 #: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
@@ -3603,7 +3608,7 @@ msgstr "Mover al punto de navegación"
 
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
-msgstr "Parar el ataque"
+msgstr "Dejar de atacar"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
@@ -3643,7 +3648,7 @@ msgstr "Imprimir pantalla"
 
 #: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
-msgstr "Habilitar/Desabilitar intercambios"
+msgstr "Habilitar/Deshabilitar Intercambios"
 
 #: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
@@ -3702,7 +3707,7 @@ msgstr "Ventana de habilidades"
 
 #: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
-msgstr "Ventana del minimapa"
+msgstr "Ventana del Mini-mapa"
 
 #: src/keyboardconfig.cpp:141
 msgid "Chat Window"
@@ -3718,7 +3723,7 @@ msgstr "Ventana de Configuración"
 
 #: src/keyboardconfig.cpp:147
 msgid "Debug Window"
-msgstr "Ventana de Problemas"
+msgstr "Ventana de Depurador"
 
 #: src/keyboardconfig.cpp:149
 msgid "Social Window"
@@ -3750,11 +3755,11 @@ msgstr "Ventana de comandos"
 
 #: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
-msgstr "Ventana de comprobador de robot"
+msgstr "Ventana de Chequeo de Bot"
 
 #: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
-msgstr "Ventana de jugadores conectados"
+msgstr "Ventana de Jugadores Conectados"
 
 #: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
@@ -3770,7 +3775,7 @@ msgstr "Pestaña Social Siguiente"
 
 #: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr "Teclas de Emoticones"
+msgstr "Teclas de Emoticonos"
 
 #: src/keyboardconfig.cpp:176
 msgid "Smilie"
@@ -3841,7 +3846,7 @@ msgstr "Pestaña de Chat Anterior"
 
 #: src/keyboardconfig.cpp:286
 msgid "Next Chat Tab"
-msgstr "Siguiente Pestaña De Chat"
+msgstr "Siguiente Pestaña del Chat"
 
 #: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
@@ -3953,7 +3958,7 @@ msgstr "Cambiar modo de Imitación"
 
 #: src/keyboardconfig.cpp:341
 msgid "Disable / Enable Game modifier keys"
-msgstr "Habilitar / Deshabilitar las teclas de modification del juego"
+msgstr "Habilitar / Deshabilitar las teclas de modificación del Juego"
 
 #: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
@@ -3981,428 +3986,434 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
+"Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Fuiste eliminado por "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Fuiste eliminado por %s"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
-msgstr "Intentaste recoger un objeto inexistante."
+msgstr "Intentaste recoger un objeto inexistente."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
-msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
+msgstr[0] "Recogiste un %d [@@%d|%s@@]."
+msgstr[1] "Recogiste unos %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimiento loco número %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
-msgstr "(?) seguimiento desconoicido"
+msgstr "(?) seguimiento desconocido"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr "(f) atacar a los que no son amigos"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr "(d) no atacar a los jugadores"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
-msgstr "Imitacion: "
+msgstr "Imitación: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Ves "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr "              usado para establecer parámetros personalizados."
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr "              al cliente manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Archivo de registro a usar"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Directorio a usar para registro del Chat"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Muestra la versión"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Muestra la ayuda"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Acceder con este nombre de usuario"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Acceder con la contraseña"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Acceder con este jugador"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Login server o IP"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Puerto del servidor"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usar este host de actualización"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Saltarse las actualizaciones"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Iniciar el juego en modo seguro"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Comenzar a probar controladores y auto configurar"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
@@ -4444,21 +4455,23 @@ msgstr "Suerte:"
 
 #: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
+msgstr ""
+"Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
+"servidor."
 
 #: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
-msgstr "Imposible usar esta ID."
+msgstr "Imposible usar este ID."
 
 #: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
-msgstr "Error desconocido del char-server."
+msgstr "Falla char-server desconocida."
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
@@ -4468,21 +4481,25 @@ msgstr "Estadísticas incorrectas."
 
 #: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
-msgstr "Cabello incorecto."
+msgstr "Cabello incorrecto."
 
 #: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr "Ranura incorrecta."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Raza incorrecta."
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Información"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Personaje borrado."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
@@ -4527,18 +4544,18 @@ msgstr "Todos los susurros des-ignorados."
 msgid "All whispers unignore failed."
 msgstr "Ignorar todos los susurros ha fallado."
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
-msgstr "Jugadores online: %d"
+msgstr "Jugadores conectados: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Juego"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
-msgstr "Petición de salida denegada!"
+msgstr "¡Petición de salida denegada!"
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
@@ -4550,7 +4567,7 @@ msgstr "Ya estás en el clan."
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
-msgstr "La verificación de la guild no se effectuó."
+msgstr "La verificación del clan ha fallado."
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
@@ -4569,7 +4586,7 @@ msgstr "Maestro del clan: %s"
 #: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
-msgstr "Nivel en el clan: %d"
+msgstr "Nivel del clan: %d"
 
 #: src/net/ea/guildhandler.cpp:185
 #, c-format
@@ -4611,7 +4628,7 @@ msgstr "El jugador ha rechazado la invitación al clan."
 
 #: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
-msgstr "El usuario es ahora de tu clan."
+msgstr "El usuario es ahora parte de tu clan."
 
 #: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
@@ -4626,18 +4643,18 @@ msgstr "Invitación desconocida a un clan."
 msgid "%s has left your guild."
 msgstr "%s ha dejado tu clan."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Usted fue expulsado del clan."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Fuiste expulsado del clan."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s saco alguien de tu clan."
+msgstr "%s ha sido sacado de tu clan."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invita un jugador a tu grupo"
+msgstr "/invite > Invitar a un jugador a tu grupo"
 
 #: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
@@ -4645,15 +4662,15 @@ msgstr "/leave > Dejar el grupo en el que estás"
 
 #: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Expulsa a alguien del grupo en el que estás"
+msgstr "/kick > Expulsar a alguien del grupo en el que estás"
 
 #: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
+msgstr "/item > Mostrar/Cambiar opciones para compartir objetos en el grupo"
 
 #: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Mostrar/Cambiar el compartir experiencia en el grupo "
+msgstr "/exp > Mostrar/Cambiar opciones para compartir experiencia en el grupo"
 
 #: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
@@ -4719,27 +4736,27 @@ msgstr ""
 
 #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
-msgstr "Compartir objetos habilitado."
+msgstr "Compartir artículos habilitado."
 
 #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
-msgstr "Compartir objetos desabilitado."
+msgstr "Compartir artículos deshabilitado."
 
 #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
-msgstr "No es posible el compartir objetos."
+msgstr "No se pueden compartir artículos."
 
 #: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "Compartir objetos desconocido."
+msgstr "Compartir artículos desconocido."
 
 #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
-msgstr "Compartir experiencia activado."
+msgstr "Compartir experiencia habilitado."
 
 #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
-msgstr "Compartir experiencia desactivado ."
+msgstr "Compartir experiencia habilitado."
 
 #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
@@ -4751,7 +4768,7 @@ msgstr "Compartir experiencia desconocido."
 
 #: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
-msgstr "Fallo al usar el objeto."
+msgstr "Fallo al usar el artículo."
 
 #: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
@@ -4759,68 +4776,68 @@ msgstr "Imposible equipar."
 
 #: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "Cuenta no encontrada. Por favor re-conéctate."
+msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr "Contrasena antigua incorrecta."
+msgstr "Contraseña antigua incorrecta."
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "Nueva contrasena es muy corta."
+msgstr "Nueva contraseña es muy corta."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
-msgstr "Contrasena incorrecta."
+msgstr "Contraseña incorrecta."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Has sido proscrito permanentemente del juego. Por favor contacta con el "
+"equipo de GM."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
-msgstr "Cliente es demasiado antíguo."
+msgstr "Cliente es demasiado antiguo."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Has sido baneado temporalmente del juego %s.\n"
-"Por favor contacta un GM de nuestro equipo via el foro."
+"Has sido proscrito temporalmente del juego hasta %s.\n"
+"Por favor contacta al equipo de GM a través de los foros."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
@@ -4860,7 +4877,7 @@ msgstr "%s no puede unirse a tu grupo porque está completamente lleno."
 #: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "QQQ respuesta desconocida a la invitacion de %s."
+msgstr "QQQ Respuesta desconocida a la invitación de %s."
 
 #: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
@@ -4878,7 +4895,7 @@ msgstr "Un miembro desconocido intentó decir: %s"
 
 #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
-msgstr "Estás muerto"
+msgstr "Estás muerto."
 
 #: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
@@ -4886,7 +4903,7 @@ msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
 
 #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
-msgstr "Ya no estás tan vivo..."
+msgstr "Ya no estás tan vivo."
 
 #: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
@@ -4894,7 +4911,7 @@ msgstr "Las manos frías de la muerte se están apoderando de tu alma."
 
 #: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
-msgstr "Fin Del Juego!"
+msgstr "¡Fin del Juego!"
 
 #: src/net/ea/playerhandler.cpp:102
 msgid "Insert coin to continue."
@@ -4913,8 +4930,8 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"¡Parece que tu plan de romper las armas de tus enemigos con tu garganta "
-"falló!"
+"Parece que tu plan de romper las armas de tus enemigos golpeándolas con tu "
+"garganta falló."
 
 #: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
@@ -4963,7 +4980,7 @@ msgstr "Eres un cadáver."
 
 #: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
-msgstr "Sin vida, descansa en paz."
+msgstr "Despojado de la vida, descansas en paz."
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
@@ -5005,7 +5022,9 @@ msgstr "Mensaje"
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
-msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
+msgstr ""
+"Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la "
+"salud."
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5015,7 +5034,7 @@ msgstr ""
 #: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
-msgstr "Has cogido %s."
+msgstr "Has recogido %s."
 
 #: src/net/ea/playerhandler.cpp:459
 #, c-format
@@ -5060,19 +5079,19 @@ msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
 #: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
-msgstr "PV insuficiente!"
+msgstr "¡HP insuficiente!"
 
 #: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr "SP insuficiente!"
+msgstr "¡SP insuficiente!"
 
 #: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
-msgstr "No tienes ninguna nota armenzada!"
+msgstr "¡No tienes ningún memo!"
 
 #: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
-msgstr "No puedes hacer esto ahora mismo!"
+msgstr "¡No puedes hacer esto ahora mismo!"
 
 #: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
@@ -5084,15 +5103,15 @@ msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
 #: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
-msgstr "Necesitas otra Gema Roja!"
+msgstr "¡Necesitas otra gema roja!"
 
 #: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
-msgstr "Necesitas otra Gema Azul!"
+msgstr "¡Necesitas otra gema azul!"
 
 #: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
-msgstr "Llevas muchas cosas para hacer esto!"
+msgstr "¡Estás llevando muchas cosas para hacer esto!"
 
 #: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
@@ -5100,7 +5119,7 @@ msgstr "Huh? Qué es eso?"
 
 #: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
-msgstr "Fallo al teletransportar..."
+msgstr "Warp fallido..."
 
 #: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
@@ -5156,7 +5175,7 @@ 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 anadir objeto por una razón desconocida."
+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."
@@ -5166,7 +5185,7 @@ msgstr "Intercambio Cancelado."
 msgid "Trade completed."
 msgstr "Intercambio Realizado."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Fuerza"
 
@@ -5175,7 +5194,7 @@ msgstr "Fuerza"
 msgid "Strength %+.1f"
 msgstr "Fuerza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Agilidad"
 
@@ -5184,7 +5203,7 @@ msgstr "Agilidad"
 msgid "Agility %+.1f"
 msgstr "Agilidad %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Destreza"
 
@@ -5193,7 +5212,7 @@ msgstr "Destreza"
 msgid "Dexterity %+.1f"
 msgstr "Destreza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalidad"
 
@@ -5202,7 +5221,7 @@ msgstr "Vitalidad"
 msgid "Vitality %+.1f"
 msgstr "Vitalidad %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligencia"
 
@@ -5281,7 +5300,7 @@ msgstr "Personaje eliminado."
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "Seleccion fuera de rango."
+msgstr "Selección fuera de rango."
 
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
@@ -5296,7 +5315,7 @@ msgstr "No hay servidores disponibles."
 #: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
-msgstr "Tópico: %s"
+msgstr "Tema: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
@@ -5356,7 +5375,7 @@ msgstr "Error al cambiar estado del miembro."
 
 #: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr "Error de Token-mágico ."
+msgstr "magic_token equivocado."
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
@@ -5364,7 +5383,7 @@ msgstr "El personaje ya está conectado."
 
 #: src/net/manaserv/loginhandler.cpp:99
 msgid "Account banned."
-msgstr "Cuenta Baneada."
+msgstr "Cuenta proscrita."
 
 #: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
@@ -5372,19 +5391,19 @@ msgstr "Nueva contraseña incorrecta."
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
-msgstr "Cuenta no conectada. Por favor conéctate primero."
+msgstr "Cuenta no conectada. Por favor, inicia sesión primero."
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr "Nuevo e-mail incorrecto."
+msgstr "Correo nuevo incorrecto."
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr "E-mail antiguo incorrecto."
+msgstr "Correo antiguo incorrecto."
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr "El nuevo e-mail ya existe."
+msgstr "El nuevo correo ya existe."
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
@@ -5395,7 +5414,7 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr "La version del cliente es demasiado antigua."
+msgstr "La versión del cliente es demasiado antigua."
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
@@ -5403,7 +5422,7 @@ msgstr "Nombre de usuario o contraseña incorrectos."
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
-msgstr "Cuenta Baneada"
+msgstr "Cuenta proscrita"
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
@@ -5411,7 +5430,7 @@ msgstr "Intento de conexión muy pronto tras intento previo."
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "E-mail, nombre de usuario o contraseña incorrectos."
+msgstr "Correo, nombre de usuario o contraseña incorrectos."
 
 #: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
@@ -5419,7 +5438,7 @@ msgstr "Usuario ya existe."
 
 #: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "El e-mail ya existe."
+msgstr "La dirección de correo ya existe."
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -5508,11 +5527,11 @@ msgstr "Suerte %+d"
 
 #: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
-msgstr "Fallo en la autentificación."
+msgstr "Fallo en la autenticación."
 
 #: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
-msgstr "Servidores indiponibles."
+msgstr "No hay servidores disponibles."
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
@@ -5528,7 +5547,7 @@ msgstr "Hack de velocidad detectado."
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
-msgstr "Login duplicado."
+msgstr "Inicio de sesión duplicado."
 
 #: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
@@ -5538,56 +5557,56 @@ msgstr "Error de conexión desconocido."
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Suerte"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Defensa"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "Ataque M."
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "Defensa M."
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Precisión"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasión"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Crítico"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Retardo de Ataque"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Retardo de Marcha"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Alcance de Ataque"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
 #: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
-msgstr "Adress vacía enviada a Network::connect()!"
+msgstr "¡Dirección vacía enviada a Network::connect()!"
 
 #: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
@@ -5595,54 +5614,54 @@ msgstr "No es posible determinar el host \""
 
 #: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
-msgstr "Conexión al servidor terminada."
+msgstr "Conexión al servidor terminada. "
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
 msgid "%s is not in your party!"
-msgstr "%s no está en tu grupo!"
+msgstr "¡%s no está en tu grupo!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "anónimo"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Defensa %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
-msgstr "PV %+d"
+msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
-msgstr "PM %+d"
+msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Objeto desconocido"
diff --git a/po/fi.po b/po/fi.po
index 014c4c8c7..2ab7d810e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -34,120 +34,120 @@ msgstr "huti"
 #. TRANSLATORS: this away status writed in player nick
 #: src/being.cpp:1534
 msgid "A"
-msgstr ""
+msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
 #: src/being.cpp:1539
 msgid "I"
-msgstr ""
+msgstr "-"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "Tehokkuus"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
-msgstr ""
+msgstr "Teemat"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -156,160 +156,160 @@ msgstr ""
 "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
 "käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "ystävä"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutraali"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
-msgstr ""
+msgstr "mustalistattu"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
-msgstr ""
+msgstr "vihollinen"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -320,43 +320,43 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -379,7 +379,7 @@ msgstr "PvP-taso: %d"
 #: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "Kommentti: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
@@ -391,7 +391,7 @@ msgstr "Nimi"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Hyökkää"
 
@@ -410,7 +410,7 @@ msgstr "Liiku"
 msgid "Result"
 msgstr "Tulos"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -428,21 +428,21 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr ""
+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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -454,8 +454,8 @@ msgid "Quit"
 msgstr "Sulje"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Max"
 
@@ -479,14 +479,14 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Peru"
 
@@ -518,7 +518,7 @@ msgid "The email address entries mismatch."
 msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
@@ -584,8 +584,8 @@ msgstr "Hiustyyli:"
 msgid "Race:"
 msgstr "Rotu: "
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Luo"
 
@@ -627,47 +627,47 @@ msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 msgid "Account and Character Management"
 msgstr "Tilin ja hahmojen hallinta"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Vaihda sisäänkirjautumistietoja"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Valitse"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Taso %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(tyhjä)"
 
@@ -741,12 +741,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -893,7 +893,7 @@ msgstr "Kriittinen osuma:"
 #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
 #: src/gui/debugwindow.cpp:395
 #, c-format
@@ -907,25 +907,25 @@ msgstr "Ulos: %d tavua/s"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "Tiesitkö?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Sulje"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "< Previous"
-msgstr ""
+msgstr "< Edellinen"
 
 #: src/gui/didyouknowwindow.cpp:65
 msgid "Next >"
-msgstr ""
+msgstr "Seuraava >"
 
 #: src/gui/didyouknowwindow.cpp:66
 msgid "Auto open this window"
-msgstr ""
+msgstr "Avaa tämä ikkuna automaattisesti"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
@@ -938,8 +938,8 @@ msgstr "Varusteet"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
@@ -949,23 +949,23 @@ msgstr "Apua"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "nimi"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "id"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "paino"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "määrä"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "tyyppi"
 
 #: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
@@ -981,26 +981,26 @@ msgid "Filter:"
 msgstr "Suodin:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Jaa"
 
@@ -1014,17 +1014,17 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Pudota"
@@ -1089,36 +1089,36 @@ msgstr "Nollaa ajastin"
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Taso: %d @ %f%%"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Kokemus: %d/%d, jäljellä: %d"
 
 #: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
 #: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d kp, keskim. vastustajaa 1%%:iin: %s"
 
 #: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
 #: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Tappoja: %s, kp kaikkiaan: %s"
 
 #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
 #: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Keskim. kp: %s, Keskim. vastustajaa seur. tasoon: %s"
 
 #: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
 #: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Tappoa/min: %s, kp/min: %s"
 
 #: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
@@ -1126,41 +1126,41 @@ msgstr ""
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kokemustahti / %d min: %s"
+msgstr[1] "Kokemustahti / %d min: %s<"
 
 #: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Aika ensi tasolle %d min perusteella: %s"
+msgstr[1] "Aika ensi tasolle %d min perusteella: %s"
 
 #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Viime tapon kp:"
 
 #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
 #: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Aika jackon resetiin:"
 
 #: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
 #: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
 #: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "  Aika seur. tasolle: %s"
 
 #: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:370
 msgid "jacko spawning"
-msgstr ""
+msgstr "jacko elää!"
 
 #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
 msgid "You have left the guild."
@@ -1247,31 +1247,27 @@ msgstr "tilapalkki"
 msgid "Need"
 msgstr "Tarvitaan"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Odotetaan palvelinta"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Lakkaa odottamasta"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Lähetä"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Seuraava"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Vastaanottaja:"
@@ -1290,6 +1286,7 @@ msgid "Outfit: %d"
 msgstr "Asu: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
@@ -1337,7 +1334,7 @@ msgstr "Vaimenna"
 #: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693
 #: src/gui/popupmenu.cpp:716
 msgid "Black list"
-msgstr ""
+msgstr "Musta lista"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
 #: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415
@@ -1345,7 +1342,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr ""
+msgstr "Aseta viholliseksi"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1373,7 +1370,7 @@ msgstr "Huomioi jälleen"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -1425,7 +1422,7 @@ msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Riisu"
 
@@ -1433,17 +1430,17 @@ msgstr "Riisu"
 #: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741
 #: src/gui/popupmenu.cpp:830
 msgid "Add comment"
-msgstr ""
+msgstr "Lisää kommentti"
 
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
 #: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
 msgid "Buy (?)"
-msgstr ""
+msgstr "Osta (?)"
 
 #: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
 #: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Sell (?)"
-msgstr ""
+msgstr "Myy (?)"
 
 #: src/gui/popupmenu.cpp:312
 msgid "Kick"
@@ -1475,10 +1472,10 @@ msgstr "Pelaajat"
 
 #: src/gui/popupmenu.cpp:546
 msgid "Pick up"
-msgstr "Nosta"
+msgstr "Poimi"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
@@ -1490,18 +1487,18 @@ msgstr "Karttaolio"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Poista"
 
 #: src/gui/popupmenu.cpp:573
 msgid "Warp"
-msgstr ""
+msgstr "Warppaa"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Lataa vanhat asut"
+msgid "Clear outfit"
+msgstr "Poista asu"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1525,7 +1522,7 @@ msgstr "Salli korostus"
 
 #: src/gui/popupmenu.cpp:640
 msgid "Don't remove name"
-msgstr ""
+msgstr "Älä poista nimeä"
 
 #: src/gui/popupmenu.cpp:642
 msgid "Remove name"
@@ -1539,118 +1536,118 @@ msgstr "Ota poissaolo käyttöön"
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Eroa"
 
 #: src/gui/popupmenu.cpp:654
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Kopioi leikepöydälle"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
-msgstr ""
+msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
-msgstr ""
+msgstr "Kommentti:                    "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
-msgstr ""
+msgstr "Pudota kaikki"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
-msgstr ""
+msgstr "Kopioi keskusteluun"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -1700,7 +1697,7 @@ msgstr "Valitse palvelimesi"
 
 #: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #: src/gui/serverdialog.cpp:253
 msgid "Port:"
@@ -1747,11 +1744,11 @@ msgstr "Valmistelen latausta"
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -1820,7 +1817,7 @@ msgstr "Näytä keskustelun värilista"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "Komennot"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
@@ -1828,7 +1825,7 @@ msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "Rajat"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
@@ -1840,7 +1837,7 @@ msgstr "Keskusteluvälilehden riviraja"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "Lokit"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1852,7 +1849,7 @@ msgstr "Näytä keskusteluhistoria"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "Viestit"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
@@ -1860,7 +1857,7 @@ msgstr "Piilota kauppaviestit"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "Välilehdet"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
@@ -1892,23 +1889,23 @@ msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "Aika"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "Käytä paikallista aikaa"
 
 #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
 msgid "Other"
-msgstr ""
+msgstr "Muu"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Highlight words (separated by comma)"
-msgstr ""
+msgstr "Korosta sanat (pilkuin erotettu)"
 
 #: src/gui/setup_chat.cpp:128
 msgid "Show MVP messages"
-msgstr ""
+msgstr "Näytä MVP-viestit"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
@@ -1979,7 +1976,7 @@ msgstr "Ota peliohjain käyttöön"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -1991,7 +1988,7 @@ msgstr "Lopeta"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Pyöritä ohjainta, älä paina nappeja"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2071,19 +2068,19 @@ msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr ""
+msgstr "Ota laiska vieritys käyttöön"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr ""
+msgstr "Vierityksen laiskuus"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
-msgstr ""
+msgstr "Vierityksen säde"
 
 #: src/gui/setup_other.cpp:97
 msgid "Moving"
-msgstr ""
+msgstr "Liikkuminen"
 
 #: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
@@ -2103,7 +2100,7 @@ msgstr "Villiliike (a) -ohjelma"
 
 #: src/gui/setup_other.cpp:112
 msgid "Player"
-msgstr ""
+msgstr "Pelaaja"
 
 #: src/gui/setup_other.cpp:114
 msgid "Show own hp bar"
@@ -2127,7 +2124,7 @@ msgstr "Näytä pelaajaponnahdusikkunat"
 
 #: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr ""
+msgstr "Poissaoloviesti"
 
 #: src/gui/setup_other.cpp:132
 msgid "Show job"
@@ -2139,7 +2136,7 @@ msgstr "Ota käyttöön hyökkäyssuodin"
 
 #: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
-msgstr ""
+msgstr "Ota käyttöön mainosprotokolla"
 
 #: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
@@ -2155,15 +2152,15 @@ msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
-msgstr ""
+msgstr "Bottien tuki"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr ""
+msgstr "Ota käyttöön huutokauppabotin tuki"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
+msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
@@ -2175,7 +2172,7 @@ msgstr "Ota bottitutka käyttöön"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2195,11 +2192,11 @@ msgstr "Näytä tausta"
 
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Ota lisätehot käyttöön ;)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Sopeuta tehokkuusasetukset automaattisesti"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Hw acceleration"
@@ -2208,38 +2205,39 @@ msgstr "Rautakiihdytys"
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
+"Ota käyttöön läpinäkyvyysvälimuisti (ohjelmallinen, voi olla muistisyöppö)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Ota käyttöön karttareduktio (ohjelmallinen)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Parempi laatu (poista käytöstä jos tarvitset lisätehoa)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Ota käyttöön alfakanavan korjaus (ohjelmallinen, voi olla hidas)"
 
 #: src/gui/setup_perfomance.cpp:77
 msgid "Show beings transparency"
-msgstr ""
+msgstr "Näytä olioiden läpinäkyvyys"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Ota käyttöön uudelleenjärjestyshahmot"
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Pieni muisti, käytä vähemmän muistia"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Poista kehittynyt olentojen välimuisti käytöstä (ohjelmallinen)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Poista olentojen välimuisti käytöstä (ohjelmallinen)"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
@@ -2255,7 +2253,7 @@ msgstr "Näytä oma nimi"
 
 #: src/gui/setup_players.cpp:63
 msgid "Enable extended mouse targeting"
-msgstr ""
+msgstr "Ota käyttöön laajennettu kohteen valinta hiirellä"
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
@@ -2271,19 +2269,19 @@ msgstr "Turvaa kaupat"
 
 #: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
-msgstr ""
+msgstr "Turvattomia merkkejä nimissä"
 
 #: src/gui/setup_players.cpp:78
 msgid "Show statuses"
-msgstr ""
+msgstr "Näytä tilat"
 
 #: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "Näytä IP-osoitteet kuvakaappauksissa"
 
 #: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
-msgstr ""
+msgstr "Salli itsen parantaminen hiiren napsautuksella"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2311,11 +2309,11 @@ msgstr "Pyyhitty"
 
 #: src/gui/setup_relations.cpp:75
 msgid "Blacklisted"
-msgstr ""
+msgstr "Mustalla listalla"
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Vihollinen"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2331,7 +2329,7 @@ msgstr "Vanha"
 
 #: src/gui/setup_relations.cpp:247
 msgid "Relations"
-msgstr ""
+msgstr "Suhteet"
 
 #: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
@@ -2363,59 +2361,59 @@ msgstr "Jättimäinen (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Kiina (kiina)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Tsekki"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Englanti"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Suomi"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Ranska"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Saksa"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesia"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "Puola"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "Japani"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Hollanti (Belgia/fleemi)"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
-msgstr ""
+msgstr "Portugali"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugali (Brasilia)"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Russian"
-msgstr ""
+msgstr "Venäjä"
 
 #: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espanja (Kastilli)"
 
 #: src/gui/setup_theme.cpp:191
 msgid "Theme"
@@ -2427,7 +2425,7 @@ msgstr "Käyttöliittymän teema"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "Kieli"
 
 #: src/gui/setup_theme.cpp:195
 msgid "Main Font"
@@ -2447,11 +2445,11 @@ msgstr "Ohjekirjasin"
 
 #: src/gui/setup_theme.cpp:199
 msgid "Secure font"
-msgstr ""
+msgstr "Turvallinen kirjasin"
 
 #: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
-msgstr ""
+msgstr "Japanilainen kirjasin"
 
 #: src/gui/setup_theme.cpp:237
 msgid "Font size"
@@ -2528,7 +2526,7 @@ msgstr "Hiukkastehosteet"
 
 #: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
-msgstr "Näytä ottoviesti"
+msgstr "Näytä poimintaviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:295
@@ -2649,7 +2647,7 @@ msgstr "Näytä linkit ilmoituksessa"
 
 #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
 msgid "Auction"
-msgstr ""
+msgstr "Huutokauppa"
 
 #: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
@@ -2694,194 +2692,204 @@ msgstr "Taso: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Kilta"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Killasta %s eroa pyydetty."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Jäsenen kutsuminen kiltaan"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Eroa killasta?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Ryhmä"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Hyö"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Luo kilta"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -2995,7 +3003,7 @@ msgstr "Komento:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
-msgstr ""
+msgstr "Kommentti:"
 
 #: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
@@ -3071,33 +3079,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Valmis"
 
@@ -3159,7 +3167,7 @@ msgstr "Hiukkastehosteet"
 
 #: src/gui/userpalette.cpp:132
 msgid "Pickup Notification"
-msgstr "Ottoilmoitus"
+msgstr "Poimintailmoitus"
 
 #: src/gui/userpalette.cpp:133
 msgid "Exp Notification"
@@ -3249,23 +3257,23 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3519,11 +3527,11 @@ msgstr "Pu"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "T?"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Tiesitkö"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
@@ -3551,7 +3559,7 @@ msgstr "Kärry"
 
 #: src/keyboardconfig.cpp:43
 msgid "Basic Keys"
-msgstr ""
+msgstr "Perusnäppäimet"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Up"
@@ -3599,7 +3607,7 @@ msgstr "Keskeytä hyökkäys"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
-msgstr ""
+msgstr "Poista kohdevalinta"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
@@ -3615,11 +3623,11 @@ msgstr "Pelaaja kohteeksi"
 
 #: src/keyboardconfig.cpp:71
 msgid "Pickup"
-msgstr "Nouki"
+msgstr "Poimi"
 
 #: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
-msgstr "Muuta noston tyyppiä"
+msgstr "Muuta poiminnan tyyppiä"
 
 #: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
@@ -3647,7 +3655,7 @@ msgstr "Valitse OK"
 
 #: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr ""
+msgstr "Pikavalintanäppäimet"
 
 #: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
@@ -3670,7 +3678,7 @@ msgstr "Tavarapikavalinta %d"
 
 #: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
-msgstr ""
+msgstr "Ikkunanäppäimet"
 
 #: src/keyboardconfig.cpp:129
 msgid "Help Window"
@@ -3750,7 +3758,7 @@ msgstr "Kuka on linjoilla -ikkuna"
 
 #: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
-msgstr ""
+msgstr "Tiesitkö-ikkuna"
 
 #: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
@@ -3762,7 +3770,7 @@ msgstr "Seuraava sos. välilehti"
 
 #: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr ""
+msgstr "Elenäppäimet"
 
 #: src/keyboardconfig.cpp:176
 msgid "Smilie"
@@ -3797,7 +3805,7 @@ msgstr "Eleen pikavalinta %d"
 
 #: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
-msgstr ""
+msgstr "Asunäppäimet"
 
 #: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
@@ -3813,7 +3821,7 @@ msgstr "Kopioi varusteet asuksi"
 
 #: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
-msgstr ""
+msgstr "Keskustelunäppäimet"
 
 #: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
@@ -3837,7 +3845,7 @@ msgstr "Seuraava keskusteluvälilehti"
 
 #: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Sulje tämä keskusteluvälilehti"
 
 #: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
@@ -3857,7 +3865,7 @@ msgstr "Poistu keskustelusyötöstä"
 
 #: src/keyboardconfig.cpp:299
 msgid "Other Keys"
-msgstr ""
+msgstr "Muut näppäimet"
 
 #: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
@@ -3921,7 +3929,7 @@ msgstr "Vaihda magiahyökkäystä"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Vaihda PvP-hyökkäystä"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -3965,7 +3973,7 @@ msgstr "Vaihda kameran toimintaa"
 
 #: src/keyboardconfig.cpp:350
 msgid "Modifier key"
-msgstr ""
+msgstr "Muokkausnäppäin"
 
 #: src/keyboardconfig.cpp:429
 #, c-format
@@ -3977,427 +3985,430 @@ msgstr ""
 "ole hyvä ja poista päällekkäisyydet. "
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Sinut otti hengiltä "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Sinut tappoi %s."
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
-msgstr "Yritit nostaa olemattoman tavaran."
+msgstr "Yritit poimia olemattoman tavaran."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
-msgstr "Tuntematon ongelma esti tavaran nostamisen."
+msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
-msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
+msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
+msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) tuntematon seuraaminen"
+msgstr "(?) tuntematon liikkumistapa"
 
-#: src/localplayer.cpp:1918
-#, fuzzy, c-format
+#: src/localplayer.cpp:1925
+#, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(?) villiliike"
+msgstr "(%d) villiliike nro %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
-msgstr ""
+msgstr "(a) jousiampujan hyökkäyskantama"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
-msgstr "(A) mene, hyökkää, nosta"
+msgstr "(A) mene, hyökkää, poimi"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
-msgstr "(S) pieni nosto 1x1 ruutua"
+msgstr "(S) pieni poiminta 1x1 ruutua"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
-msgstr "(D) oletusnosto 2x1 ruutua"
+msgstr "(D) oletuspoiminta 2x1 ruutua"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) nosto edestä 2x3 ruutua"
+msgstr "(F) poiminta edestä 2x3 ruutua"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
-msgstr "(3) nosto 3x3 ruutua"
+msgstr "(3) poiminta 3x3 ruutua"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
-msgstr "(g) mene ja nosta etäisyydellä 4"
+msgstr "(g) mene ja poimi etäisyydellä 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
-msgstr "(G) mene ja nosta etäisyydellä 8"
+msgstr "(G) mene ja poimi etäisyydellä 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
-msgstr "(A) mene ja nosta maksimietäisyydellä"
+msgstr "(A) mene ja poimi maksimietäisyydellä"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
-msgstr "(?) nosta"
+msgstr "(?) poiminta"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) säästä ystävät, listi muut"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) hyökkää jos huonot suhteet"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) älä hyökkää pelaajien kimppuun"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) pelaajien kanssa taistelu"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/localplayer.cpp:2234
-#, fuzzy
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
-msgstr "Pelimuokkaimet käytössä"
+msgstr "Pelimuokkaimet ovat tuntemattomia"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Näet "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
-msgstr ""
+msgstr "manaplus [asetukset] [manaplus-tiedosto]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
+msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
-msgstr ""
+msgstr "                  jolla asetetaan erikoisvalitsimia"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
-msgstr ""
+msgstr "                  manaplus-ohjelmalle."
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
-msgstr "Parametrit:"
+msgstr "Asetusvivut:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Käytettävä lokitiedosto"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Käytettävä keskustelulokihakemisto"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Näytä versionumero"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Näytä tämä ohje"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Ohita päivityslataukset"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
@@ -4453,7 +4464,7 @@ msgstr "Tuntematon hahmopalvelinvirhe."
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
@@ -4469,15 +4480,19 @@ msgstr "Väärä hiustyyli."
 msgid "Incorrect slot."
 msgstr "Väärä paikka."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Väärä rotu."
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Tietoja"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Hahmo poistettu."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
@@ -4508,30 +4523,30 @@ msgstr "MVP-pelaaja: "
 
 #: src/net/ea/chathandler.cpp:370
 msgid "All whispers ignored."
-msgstr ""
+msgstr "Kaikki kuiskaukset jätetään huomiotta."
 
 #: src/net/ea/chathandler.cpp:374
 msgid "All whispers ignore failed."
-msgstr ""
+msgstr "Kuiskausten huomiotta jättäminen epäonnistui."
 
 #: src/net/ea/chathandler.cpp:385
 msgid "All whispers unignored."
-msgstr ""
+msgstr "Kaikki kuiskaukset huomioidaan taas."
 
 #: src/net/ea/chathandler.cpp:389
 msgid "All whispers unignore failed."
-msgstr ""
+msgstr "Kuiskausten huomiointi epäonnistui."
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Käyttäjiä palvelimella: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Peli"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Lopetuspyyntö evätty!"
 
@@ -4621,11 +4636,11 @@ msgstr "Tuntematon vastaus kiltakutsuun."
 msgid "%s has left your guild."
 msgstr "%s on eronnut killastasi."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Sinut on potkittu killasta."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Sinut potkittiin ulos killasta."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s on potkittu ulos killastasi."
@@ -4759,40 +4774,40 @@ msgstr "Vanha salsana on väärä."
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "Rekisteröimätön tunniste."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Väärä salasana."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "Tili vanhentunut."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Liian vanha asiakasohjelma."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4801,15 +4816,15 @@ msgstr ""
 "Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
 "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Palvelin on täynnä."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Käyttäjätunnus on jo käytössä."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
@@ -5003,7 +5018,7 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 #: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
-msgstr "%s nostettu."
+msgstr "%s poimittu."
 
 #: src/net/ea/playerhandler.cpp:459
 #, c-format
@@ -5154,7 +5169,7 @@ msgstr "Kaupat peruttu."
 msgid "Trade completed."
 msgstr "Kaupat tuli."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Voima"
 
@@ -5163,7 +5178,7 @@ msgstr "Voima"
 msgid "Strength %+.1f"
 msgstr "Voima %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Ketteryys"
 
@@ -5172,7 +5187,7 @@ msgstr "Ketteryys"
 msgid "Agility %+.1f"
 msgstr "Ketteryys %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Näppäryys"
 
@@ -5181,7 +5196,7 @@ msgstr "Näppäryys"
 msgid "Dexterity %+.1f"
 msgstr "Näppäryys %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Elinvoima"
 
@@ -5190,7 +5205,7 @@ msgstr "Elinvoima"
 msgid "Vitality %+.1f"
 msgstr "Elinvoima %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Älykkyys"
 
@@ -5526,52 +5541,52 @@ msgstr "Tuntematon yhteysongelma."
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Tuuri"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Puolustus"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "T.-hyökkäys"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
-msgstr ""
+msgstr "Vahinko sekunnissa."
 
 #: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
@@ -5590,143 +5605,47 @@ msgstr "Yhteys palvelimeen katkaistu. "
 msgid "%s is not in your party!"
 msgstr "%s ei ole ryhmässäsi!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Tulosta '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Vilkuta nimeä"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Leijuva '...' -puhekupla"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "nimetön"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Hyökkäys %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Puolustus %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "VP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
-
-#~ msgid "(?) move"
-#~ msgstr "(?) liiku"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) karttanäkymä"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D) suunnittelukamera"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/fr.po b/po/fr.po
index a7014eca7..ac2456f68 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,15 @@
 #   <antoinebcn@hotmail.com>, 2011.
 # Bernard  <nard@bh28.net>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
-#   <reidyaro@gmail.com>, 2011.
+#   <reidyaro@gmail.com>, 2011, 2012.
+# Steel Style <steelstyle@free.fr>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-28 21:35+0000\n"
-"Last-Translator: reid <reidyaro@gmail.com>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
 "Language: fr\n"
@@ -45,114 +46,114 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages vides."
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -161,161 +162,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:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
-msgstr "sous liste noir"
+msgstr "sous liste noire"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr "ennemi"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -325,44 +326,44 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 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:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -397,7 +398,7 @@ msgstr "Nom"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attaquer"
 
@@ -416,7 +417,7 @@ msgstr "Déplacement"
 msgid "Result"
 msgstr "Résultat"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -434,21 +435,21 @@ msgstr "Prix : %s / Total : %s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr "Montant"
+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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -460,8 +461,8 @@ msgid "Quit"
 msgstr "Quitter"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Max."
 
@@ -485,14 +486,14 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -524,7 +525,7 @@ msgid "The email address entries mismatch."
 msgstr "Les deux adresses e-mail ne correspondent pas."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -590,8 +591,8 @@ msgstr "Coupe :"
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Créer"
 
@@ -633,47 +634,47 @@ msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 msgid "Account and Character Management"
 msgstr "Gestion du compte et du personnage"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Changer de compte"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Se désinscrire"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Entrer le mot de passe pour effacer le personnage"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Choisir"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(vide)"
 
@@ -747,12 +748,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -916,7 +917,7 @@ msgid "Did You Know?"
 msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fermer"
@@ -944,8 +945,8 @@ msgstr "Équipement"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -987,26 +988,26 @@ msgid "Filter:"
 msgstr "Filtre :"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Partager"
 
@@ -1020,17 +1021,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Jeter"
@@ -1253,31 +1254,27 @@ msgstr "Barre de Statut"
 msgid "Need"
 msgstr "Restant"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Attente du serveur"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Arrêter d'attendre "
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Suivant"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ">suivant"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "A :"
@@ -1296,6 +1293,7 @@ msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
@@ -1379,7 +1377,7 @@ msgstr "Ne plus ignorer"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -1431,7 +1429,7 @@ msgid "Show Items"
 msgstr "Montrer les objets"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Déshabiller"
 
@@ -1483,8 +1481,8 @@ msgstr "Joueurs"
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
@@ -1496,8 +1494,8 @@ msgstr "Objet de carte"
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Enlever"
 
@@ -1506,8 +1504,8 @@ msgid "Warp"
 msgstr "Télétransportation"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Charger les anciennes tenues"
+msgid "Clear outfit"
+msgstr "Nettoyer les tenues"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1545,119 +1543,118 @@ msgstr "Active la fonction Absence"
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Quitter"
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Copier dans la conversation"
+msgstr "Copier vers le presse-papier"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Changer la position de la Guilde"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nom : "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -1754,11 +1751,11 @@ msgstr "Préparation du téléchargement"
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -1910,7 +1907,7 @@ msgstr "Autre"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Highlight words (separated by comma)"
-msgstr "Mots en surbrillance (séparer par un coma)"
+msgstr "Mots en surbrillance (séparés par une virgule)"
 
 #: src/gui/setup_chat.cpp:128
 msgid "Show MVP messages"
@@ -2161,15 +2158,15 @@ msgstr "Enregistrer les conversations des PNJ"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
-msgstr "Supports de robot"
+msgstr "Aide de bots"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr "Activer le support pour auction bot"
+msgstr "Activer le bot d'enchère"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Activer le support pour guild bot et désactiver le support par défault"
+msgstr "Activer le bot de guilde et désactiver le support par défault"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
@@ -2287,11 +2284,11 @@ msgstr "Montrer les Status"
 
 #: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
-msgstr "Montrer les adresses ip sur les photos d'écran"
+msgstr "Afficher les adresses ip sur les photos d'écran"
 
 #: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
-msgstr "Autoriser la récupération automatique sur clic droit de la sourie"
+msgstr "Autoriser la récupération automatique sur clic droit de la souris"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2398,9 +2395,8 @@ msgid "Indonesian"
 msgstr "Indonésien"
 
 #: src/gui/setup_theme.cpp:153
-#, fuzzy
 msgid "Polish"
-msgstr "Anglais"
+msgstr "Polonais"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
@@ -2460,7 +2456,7 @@ msgstr "Police sécurisée"
 
 #: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
-msgstr "police japonaise"
+msgstr "Police japonaise"
 
 #: src/gui/setup_theme.cpp:237
 msgid "Font size"
@@ -2710,198 +2706,208 @@ msgstr "Niveau : %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilde"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Demande pour quitter la guilde %s effectuée."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Inviter le membre de la guilde"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Quitter la guilde ?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groupe"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Vous avez demandé à quitter le groupe %s."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voudriez vous inviter dans le groupe %s ?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "dans une."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vous a invité à rejoindre la guilde %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "dans un groupe."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Vous avez été invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
@@ -3093,33 +3099,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Terminé"
 
@@ -3271,23 +3277,23 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3672,7 +3678,7 @@ msgstr "Sélectionner OK"
 
 #: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr "Touches des raccourcies"
+msgstr "Touches raccourcis"
 
 #: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
@@ -4002,431 +4008,438 @@ msgstr ""
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Vous avez été tué par "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Tu as été tué par %s"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnue"
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) mouvement de fou numerique %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr "(a) Portée des attaques des Archéens"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr "(a) attaque tous les joueurs"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr "(f) n'attaque pas des amis"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Vous voyez  "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-file]: Le fichier manaplus est un fichier XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr "utilisé pour définir des paramètres personnalisés"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr "pour le client manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : fichier journal à utiliser"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 "  -L --chat-log-dir   : Dossier a utiliser pour l'enregistrement des "
 "conversatoins"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette rubrique d'aide"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr ""
 "     --update-host : Utilise cette URL pour les fichiers de mises à jour"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 "  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Répertoire des données du jeu à charger"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Démarrer le jeu en mode sûr"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Commencer le test des drivers et la configuration "
+"automatique"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
@@ -4484,7 +4497,7 @@ msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
@@ -4500,15 +4513,19 @@ msgstr "Cheveux incorrects."
 msgid "Incorrect slot."
 msgstr "Case incorrecte."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Race incorrect."
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informations"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
@@ -4553,16 +4570,16 @@ msgstr "Tous les chuchotements ne sont plus sous silence."
 msgid "All whispers unignore failed."
 msgstr "La remise en activité de tout les chuchotements a échoué"
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Joueurs en ligne : %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Jeu"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Requête de départ refusée !"
 
@@ -4652,11 +4669,11 @@ msgstr "Réponse d'invitation à la guilde inconnue."
 msgid "%s has left your guild."
 msgstr "%s a quitté votre guilde."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Vous avez été renvoyé de la guilde."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Tu as été viré de la guilde."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s a sorti quelqu'un de votre guilde."
@@ -4794,41 +4811,41 @@ msgstr "Ancien mot de passe incorrect."
 msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "Id non enregistrée."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "Le compte a expiré."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Rejeté par le serveur."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
 "contact avec l'équipe des GM."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Client trop ancien."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4837,15 +4854,15 @@ msgstr ""
 "Vous avez temporairement été banni du jeu jusqu'au %s.\n"
 "Merci de vous mettre en contact avec l'équipe des GM sur le forum."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Serveur surpeuplé."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
@@ -5203,7 +5220,7 @@ msgstr "Échange annulé."
 msgid "Trade completed."
 msgstr "Échange finalisé."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Force"
 
@@ -5212,7 +5229,7 @@ msgstr "Force"
 msgid "Strength %+.1f"
 msgstr "Force %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Agilité"
 
@@ -5221,7 +5238,7 @@ msgstr "Agilité"
 msgid "Agility %+.1f"
 msgstr "Agilité %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Dextérité"
 
@@ -5230,7 +5247,7 @@ msgstr "Dextérité"
 msgid "Dexterity %+.1f"
 msgstr "Dextérité %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalité"
 
@@ -5239,7 +5256,7 @@ msgstr "Vitalité"
 msgid "Vitality %+.1f"
 msgstr "Vitalité %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligence"
 
@@ -5579,50 +5596,50 @@ msgstr "Erreur de connexion inconnue."
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Chance"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Défense"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "Attaque M."
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "Défense M."
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "Dommage par s."
 
@@ -5643,47 +5660,47 @@ msgstr "Connexion au serveur terminée."
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Affiche '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Fais clignoter le nom"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Bulle flottante '...'"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "anonyme"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Attaque %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Défense %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "PV %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Objet inconnu"
diff --git a/po/id.po b/po/id.po
index bd2b7c9e8..05ea93539 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
 "Language: id\n"
@@ -43,113 +43,113 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,155 +158,155 @@ msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "Teman"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "netral"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -316,43 +316,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -387,7 +387,7 @@ msgstr "Nama"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Pukul"
 
@@ -406,7 +406,7 @@ msgstr "Jalan"
 msgid "Result"
 msgstr "Hasil"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Reset"
 
@@ -429,16 +429,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -450,8 +450,8 @@ msgid "Quit"
 msgstr "Keluar"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Max"
 
@@ -475,14 +475,14 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Batal"
 
@@ -514,7 +514,7 @@ msgid "The email address entries mismatch."
 msgstr "Pengisian alamat email tidak cocok"
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Ganti sandi"
 
@@ -580,8 +580,8 @@ msgstr "Gaya rambut"
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Buat"
 
@@ -623,47 +623,47 @@ msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 msgid "Account and Character Management"
 msgstr "Manajemen Akun dan Karakter"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Ubah Login"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Tidak jadi mendaftar"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Ganti email"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Pilih"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Level %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(kosong)"
 
@@ -737,12 +737,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -906,7 +906,7 @@ msgid "Did You Know?"
 msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Tutup"
@@ -934,8 +934,8 @@ msgstr "Perlengkapan"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Lepaskan"
 
@@ -977,26 +977,26 @@ msgid "Filter:"
 msgstr "Penyaring:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Pakai"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Gunakan"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Pecah"
 
@@ -1010,17 +1010,17 @@ msgid "Weight:"
 msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Buang"
@@ -1241,31 +1241,27 @@ msgstr ""
 msgid "Need"
 msgstr "Butuh"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Menunggu ke server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Masukan"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Hapus"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Kepada:"
@@ -1284,6 +1280,7 @@ msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
@@ -1367,7 +1364,7 @@ msgstr "Batalkan pengabaian"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr ""
 
@@ -1419,7 +1416,7 @@ msgid "Show Items"
 msgstr "Perlihatkan item"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
@@ -1471,8 +1468,8 @@ msgstr "Pemain"
 msgid "Pick up"
 msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
@@ -1484,8 +1481,8 @@ msgstr "Daftar barang"
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Hapus"
 
@@ -1494,8 +1491,8 @@ msgid "Warp"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Memuat setelan lama"
+msgid "Clear outfit"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1533,119 +1530,118 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Pindahkan ke chat"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nama:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "komentar"
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Masukkan 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Masukkan setengah"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Masukkan semua"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Buang semuanya"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Muat jalan pintas iItem lama"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Muat jalan pintas Buang yang lama"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(kembalikan)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Bergerak keatas"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -1742,11 +1738,11 @@ msgstr "Menyiapkan pengunduhan"
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -2686,194 +2682,204 @@ msgstr "Level: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Organisasi"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Permintaan %s keluar dari Organisasi "
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Tinggalkan organisasi?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Kelompok"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok"
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "serang mob"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3063,33 +3069,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Mengupdate..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Main"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr ""
 
@@ -3241,23 +3247,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3962,425 +3968,428 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) jalan"
+msgstr ""
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/localplayer.cpp:2234
-#, fuzzy
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
-msgstr "Perombakan game diperbolehkan"
+msgstr ""
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4436,7 +4445,7 @@ msgstr ""
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr ""
 
@@ -4452,15 +4461,19 @@ msgstr ""
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4505,16 +4518,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4604,11 +4617,11 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
@@ -4737,54 +4750,54 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Versi yang digunakan sudah kadaluarsa."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Server kepenuhan."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
@@ -5124,7 +5137,7 @@ msgstr ""
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -5133,7 +5146,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5142,7 +5155,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5151,7 +5164,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5160,7 +5173,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5492,50 +5505,50 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
@@ -5556,134 +5569,47 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Serangan %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Pertahanan %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(l)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/it.po b/po/it.po
index 6607a008d..4439e91cb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <guglielmo__@hotmail.it>, 2011.
+#   <guglielmo__@hotmail.it>, 2011, 2012.
 #   <reidyaro@gmail.com>, 2011.
 # WildX <guglielmo__@hotmail.it>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-11-12 00:23+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,135 +21,135 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1171
+#: src/actorspritemanager.cpp:1169
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:551
+#: src/being.cpp:553
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1530
+#: src/being.cpp:1534
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1535
+#: src/being.cpp:1539
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:869 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:876 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:881 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:886
+#: src/client.cpp:964
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:968
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:999
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Accesso all'account"
 
-#: src/client.cpp:1032
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1132
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
-#: src/client.cpp:1163
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1216 src/client.cpp:1223 src/client.cpp:1357
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1232
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1258
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Cambia password"
 
-#: src/client.cpp:1259
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1278
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Cambia Email"
 
-#: src/client.cpp:1279
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1299
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1300
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1499 src/client.cpp:1529 src/client.cpp:1544
-#: src/client.cpp:1969 src/client.cpp:1976
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1675
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1709 src/client.cpp:1715
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1736
+#: src/client.cpp:1831
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:329
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -158,207 +158,207 @@ msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:363
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:379 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:390
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
-#: src/commandhandler.cpp:403 src/commandhandler.cpp:521
-#: src/commandhandler.cpp:562 src/commandhandler.cpp:602
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/commandhandler.cpp:455
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:466
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
-#: src/commandhandler.cpp:472
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
-#: src/commandhandler.cpp:500
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:505
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "Neutrale"
 
-#: src/commandhandler.cpp:529
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
-#: src/commandhandler.cpp:543
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
-#: src/commandhandler.cpp:551
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
-#: src/commandhandler.cpp:574
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
-#: src/commandhandler.cpp:581
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
-#: src/commandhandler.cpp:589
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:594
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:609
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
-#: src/commandhandler.cpp:620
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:929 src/commandhandler.cpp:975
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:939
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:956
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:972
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1051
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1063
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1067
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1171 src/commandhandler.cpp:1178
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1173 src/commandhandler.cpp:1180
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
 "(falso), \"1\", \"0\"."
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1750
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1751
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -391,20 +391,20 @@ msgstr "Bot Checker"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:303 src/gui/popupmenu.cpp:636
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
+#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:292
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:264
-#: src/gui/popupmenu.cpp:296 src/gui/popupmenu.cpp:459
-#: src/gui/popupmenu.cpp:702 src/gui/popupmenu.cpp:789
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825
 msgid "Move"
 msgstr "Movimento"
 
@@ -412,13 +412,13 @@ msgstr "Movimento"
 msgid "Result"
 msgstr "Risultato"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:276
-#: src/gui/popupmenu.cpp:293 src/gui/popupmenu.cpp:714
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
 msgid "Buy"
 msgstr "Compra"
 
@@ -435,16 +435,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:998
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:1010
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -456,8 +456,8 @@ msgid "Quit"
 msgstr "Esci"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:997 src/gui/statuswindow.cpp:1028
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Massimo"
 
@@ -466,29 +466,29 @@ msgstr "Massimo"
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:277
-#: src/gui/popupmenu.cpp:294 src/gui/popupmenu.cpp:715
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Vendi"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
 #: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:344
-#: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:500
-#: src/gui/popupmenu.cpp:526 src/gui/popupmenu.cpp:550
-#: src/gui/popupmenu.cpp:563 src/gui/popupmenu.cpp:581
-#: src/gui/popupmenu.cpp:805 src/gui/popupmenu.cpp:829
-#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1803
-#: src/gui/popupmenu.cpp:1859 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1939 src/gui/popupmenu.cpp:1978
-#: src/gui/popupmenu.cpp:2030 src/gui/popupmenu.cpp:2050
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
+#: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -520,7 +520,7 @@ msgid "The email address entries mismatch."
 msgstr "Gli indirizzi email immessi non coincidono."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Cambia la Password"
 
@@ -551,68 +551,68 @@ msgstr "La nuova password deve essere più corta di %d caratteri."
 msgid "The new password entries mismatch."
 msgstr "Le password immesse non coincidono."
 
-#: src/gui/charcreatedialog.cpp:58
+#: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
+#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
+#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Crea"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Maschio"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Femmina"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -629,126 +629,126 @@ msgstr "Sei sicuro di voler cancellare questo personaggio?"
 msgid "Account and Character Management"
 msgstr "Gestione dell'account e del personaggio"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Cambia login"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Cambia email"
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Scegli"
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Livello %d"
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(vuoto)"
 
-#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
 msgid "default"
 msgstr "Predefinito"
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr "Nero"
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr "Rosso"
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr "Verde"
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr "Blu"
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr "Oro"
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr "Giallo"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr "Rosa"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr "Viola"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr "Grigio"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr "Marrone"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr "Arcobaleno 1"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr "Arcobaleno 2"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:173 src/gui/setup_video.cpp:211
+#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
 #: src/gui/textcommandeditor.cpp:160
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:615
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:1002
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -761,13 +761,13 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:163
-#: src/gui/popupmenu.cpp:171 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:399 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:656 src/gui/popupmenu.cpp:665
-#: src/gui/popupmenu.cpp:679
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167
+#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701
+#: src/gui/popupmenu.cpp:715
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -912,8 +912,8 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:596 src/gui/shopwindow.cpp:113
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Chiudi"
 
@@ -934,14 +934,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1829
-#: src/gui/popupmenu.cpp:1874
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Togli"
 
@@ -983,31 +983,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1739
-#: src/gui/popupmenu.cpp:1831 src/gui/popupmenu.cpp:1876
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1743
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1835
-#: src/gui/popupmenu.cpp:1880
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1748 src/gui/popupmenu.cpp:1840
-#: src/gui/popupmenu.cpp:1885
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1757
-#: src/gui/popupmenu.cpp:1849 src/gui/popupmenu.cpp:1894
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Dividi"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:588
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -1016,17 +1016,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1723 src/gui/popupmenu.cpp:1852
-#: src/gui/popupmenu.cpp:1897 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1753
-#: src/gui/popupmenu.cpp:1845 src/gui/popupmenu.cpp:1890
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Lascia"
@@ -1211,23 +1211,23 @@ msgstr "Cambia server"
 
 #: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
-msgstr ""
+msgstr "Barra HP"
 
 #: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
-msgstr ""
+msgstr "Barra Mana"
 
 #: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
-msgstr ""
+msgstr "Barra dell'esperienza"
 
 #: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
-msgstr ""
+msgstr "Barra dei punti lavoro"
 
 #: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
-msgstr ""
+msgstr "Barra del peso"
 
 #: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
@@ -1235,7 +1235,7 @@ msgstr ""
 
 #: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
-msgstr ""
+msgstr "Barra dei soldi"
 
 #: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
@@ -1243,37 +1243,33 @@ msgstr ""
 
 #: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
-msgstr ""
+msgstr "Barra dello stato"
 
 #: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr "Bisogno"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "In attesa del server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Prossimo"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Invia"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:598
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Cancella"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "A:"
@@ -1292,6 +1288,7 @@ msgid "Outfit: %d"
 msgstr "Outfit: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
@@ -1304,347 +1301,355 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:635
+#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:383
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:389
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
+#: src/gui/popupmenu.cpp:682
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:189 src/gui/popupmenu.cpp:390
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:426 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:655
-#: src/gui/popupmenu.cpp:664 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714
+#: src/gui/popupmenu.cpp:727
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:392
-#: src/gui/popupmenu.cpp:400 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:657
-#: src/gui/popupmenu.cpp:680
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693
+#: src/gui/popupmenu.cpp:716
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:156
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:393
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:409
-#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:658
-#: src/gui/popupmenu.cpp:666
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:179 src/gui/popupmenu.cpp:184
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:402
-#: src/gui/popupmenu.cpp:410 src/gui/popupmenu.cpp:416
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:429
-#: src/gui/popupmenu.cpp:651 src/gui/popupmenu.cpp:659
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:673
-#: src/gui/popupmenu.cpp:681 src/gui/popupmenu.cpp:686
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709
+#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:161 src/gui/popupmenu.cpp:169
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:183
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:406
-#: src/gui/popupmenu.cpp:414 src/gui/popupmenu.cpp:420
-#: src/gui/popupmenu.cpp:425 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:663 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:685
-#: src/gui/popupmenu.cpp:690
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442
+#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455
+#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721
+#: src/gui/popupmenu.cpp:726
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:190
-#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:435
-#: src/gui/popupmenu.cpp:672 src/gui/popupmenu.cpp:692
-#: src/playerrelations.cpp:446
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
-msgstr ""
+msgstr "Ignora completamente."
 
-#: src/gui/popupmenu.cpp:198 src/gui/popupmenu.cpp:443
-#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:779
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
+#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:199 src/gui/popupmenu.cpp:444
-#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:208 src/gui/popupmenu.cpp:733
+#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:455
-#: src/gui/popupmenu.cpp:738
+#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
+#: src/gui/popupmenu.cpp:774
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:240
-#: src/gui/popupmenu.cpp:472 src/gui/popupmenu.cpp:755
+#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:760
+#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
+#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:253 src/gui/popupmenu.cpp:485
-#: src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
+#: src/gui/popupmenu.cpp:805
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:261
+#: src/gui/popupmenu.cpp:265
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:267
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:703
-#: src/gui/popupmenu.cpp:792
+#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
+#: src/gui/popupmenu.cpp:828
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:704
-#: src/gui/popupmenu.cpp:793 src/gui/popupmenu.cpp:2047
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267 src/gui/popupmenu.cpp:297
-#: src/gui/popupmenu.cpp:445 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:794
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301
+#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:493
-#: src/gui/popupmenu.cpp:720 src/gui/popupmenu.cpp:799
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
+#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:494
-#: src/gui/popupmenu.cpp:721 src/gui/popupmenu.cpp:800
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:312
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:319
+#: src/gui/popupmenu.cpp:323
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:324
+#: src/gui/popupmenu.cpp:328
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:326
+#: src/gui/popupmenu.cpp:330
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:332
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:341 src/gui/popupmenu.cpp:497
+#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+msgid "Players"
+msgstr "Giocatori"
+
+#: src/gui/popupmenu.cpp:546
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:1773
-#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1898
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:566
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:567
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:2008
-#: src/gui/popupmenu.cpp:2019 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:547
+#: src/gui/popupmenu.cpp:573
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:589
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:576 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:577
+#: src/gui/popupmenu.cpp:609
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:578
+#: src/gui/popupmenu.cpp:610
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:602
+#: src/gui/popupmenu.cpp:636
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:638
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:606
+#: src/gui/popupmenu.cpp:640
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:642
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:644
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:612
+#: src/gui/popupmenu.cpp:646
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:617 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
+msgstr "Lascia"
+
+#: src/gui/popupmenu.cpp:654
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:813
+#: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1286
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Rinomina mappa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1288
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nome:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1338
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1340
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
-msgstr ""
+msgstr "Aggiungi allo scambio"
 
-#: src/gui/popupmenu.cpp:1715
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1716
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1717
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1728
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1749 src/gui/popupmenu.cpp:1841
-#: src/gui/popupmenu.cpp:1886
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1769
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1770
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1801 src/gui/popupmenu.cpp:1857
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Carica vecchie scorciatoie oggetti"
 
-#: src/gui/popupmenu.cpp:1902
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Carica vecchie scorciatoie drop"
 
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1963
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
-msgstr ""
+msgstr "Nascondi"
 
-#: src/gui/popupmenu.cpp:1934 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
-msgstr ""
+msgstr "Mostra"
 
-#: src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1977 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1995 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2005 src/gui/popupmenu.cpp:2016
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2018
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr ""
 
@@ -1741,11 +1746,11 @@ msgstr "Preparazione download"
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -2033,11 +2038,11 @@ msgstr "Mostra la barra hp dei nemici, punti vita"
 
 #: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr ""
+msgstr "Ciclo di target sui nemici"
 
 #: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
-msgstr ""
+msgstr "Mostra le particelle per le transizioni di mappa"
 
 #: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
@@ -2109,11 +2114,11 @@ msgstr "Abilita statistiche veloci"
 
 #: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
-msgstr ""
+msgstr "Ciclo di target sui giocatori"
 
 #: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
-msgstr ""
+msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro"
 
 #: src/gui/setup_other.cpp:126
 msgid "Show players popups"
@@ -2235,10 +2240,6 @@ msgstr ""
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Giocatori"
-
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
 msgstr "Mostra il sesso"
@@ -2388,74 +2389,78 @@ msgid "Indonesian"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:153
-msgid "Japanese"
+msgid "Polish"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:154
-msgid "Dutch (Belgium/Flemish)"
+msgid "Japanese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:155
-msgid "Portuguese"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:156
-msgid "Portuguese (Brazilian)"
+msgid "Portuguese"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:157
-msgid "Russian"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:158
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:190
+#: src/gui/setup_theme.cpp:191
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:192
+#: src/gui/setup_theme.cpp:193
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:194
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:195
 msgid "Main Font"
 msgstr "Font principale"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:196
 msgid "Bold font"
 msgstr "Font in grassetto"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:197
 msgid "Particle font"
 msgstr "Font con particelle"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:198
 msgid "Help font"
 msgstr "Help font"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:199
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:236
+#: src/gui/setup_theme.cpp:237
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
-#: src/gui/setup_theme.cpp:377
+#: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
-#: src/gui/setup_theme.cpp:378 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
@@ -2605,15 +2610,17 @@ msgstr "Nuova risoluzione:                                         "
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "RIsoluzione schermo cambiata"
 
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
+"ridotta"
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "Impostazioni effetti particelle cambiate."
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
@@ -2621,15 +2628,15 @@ msgstr "I cambi saranno effettuati al cambio della mappa."
 
 #: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
-msgstr ""
+msgstr "Negozio personale"
 
 #: src/gui/shopwindow.cpp:118
 msgid "Buy items"
-msgstr ""
+msgstr "Compra oggetti"
 
 #: src/gui/shopwindow.cpp:119
 msgid "Sell items"
-msgstr ""
+msgstr "Vendi oggetti"
 
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 #: src/gui/tradewindow.cpp:89
@@ -2638,11 +2645,11 @@ msgstr "Aggiungi"
 
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
 msgid "Announce"
-msgstr ""
+msgstr "Annuncia"
 
 #: src/gui/shopwindow.cpp:127
 msgid "Show links in announce"
-msgstr ""
+msgstr "Mostra link nell'annuncio"
 
 #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
 msgid "Auction"
@@ -2656,7 +2663,7 @@ msgstr "Richiesta di commercio"
 #: src/gui/shopwindow.cpp:749
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s vuole %s %s accetti?"
 
 #: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2669,486 +2676,232 @@ msgstr "Su"
 #: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
-msgstr ""
+msgstr "Punti abilità disponibili: %d"
 
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
-msgstr ""
+msgstr "Abilità impostata %d"
 
 #: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
-msgstr ""
+msgstr "Abilità %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
-msgstr ""
+msgstr "Lvl: %d"
 
 #: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
-msgstr ""
+msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Invitato utente %s alla gilda %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Abbandono gilda %s richiesto."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Chi vorresti invitare alla gilda %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Lasciare la gilda?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Invitato utente al gruppo %s"
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Abbandono gruppo %s richiesto"
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "Invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Chi vorresti invitare al gruppo %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
-msgstr ""
+msgstr "Lasciare il gruppo?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "Sei sicuro di voler lasciare il gruppo %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
-msgstr ""
+msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
-msgstr ""
+msgstr "Crea gruppo"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
-msgstr ""
+msgstr "Sociale"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
+msgstr "Invita"
+
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1286
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Accettato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Rifiutato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Accettato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Rifiutato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Stai creando una gilda chiamata %s"
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Stai creando un party chiamato %s"
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
-msgstr ""
+msgstr "Nome della gilda"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
-msgstr ""
+msgstr "Scegli un nome per la tua gilda"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%s ti ha invitato ad entrare nella gilda %s"
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Accetta invito alla gilda"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Sei stato invitato ad entrare in un party"
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "Sei stato invitato ad entrare nel gruppo %s"
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Impossibile creare un party, sei già in un party"
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
-msgstr ""
+msgstr "Nome del gruppo"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
-msgstr ""
+msgstr "Scegli un nome per il tuo party"
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:204
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:209
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:214
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:219
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:224
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:229
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:247
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:251
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:261
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:266
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:271
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:276
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:281
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:286
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:291
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:296
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:317
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:321
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:325
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:334 src/gui/statuspopup.cpp:357
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:339
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:344
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:348 src/gui/statuspopup.cpp:373
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:361
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:365
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:369
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:407
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:411
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:415
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:440
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:448
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:456
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:461
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:466
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:471
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:476
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:480
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:489
-msgid "(a) attack all players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:493
-msgid "(f) attack not friends"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(b) attack bad relations"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:501
-msgid "(d) dont attack players"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505
-msgid "(?) pvp attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:514
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:518
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:522
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:531
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:534
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537 src/gui/statuspopup.cpp:557
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:545
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:549
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:553
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:564
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:569
-msgid "Game modifiers are enabled"
-msgstr ""
+msgstr "Speciali"
 
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
@@ -3191,198 +2944,68 @@ msgstr ""
 #: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Livello: %d (GM:%d)"
 
 #: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:717
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:847
-#: src/gui/statuswindow.cpp:870 src/gui/statuswindow.cpp:889
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:778
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:655 src/gui/statuswindow.cpp:775
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:658
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:762
-#: src/gui/statuswindow.cpp:803
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:664 src/gui/statuswindow.cpp:678
-#: src/gui/statuswindow.cpp:710 src/gui/statuswindow.cpp:729
-#: src/gui/statuswindow.cpp:746 src/gui/statuswindow.cpp:765
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:806
-#: src/gui/statuswindow.cpp:836 src/gui/statuswindow.cpp:862
-#: src/gui/statuswindow.cpp:876 src/gui/statuswindow.cpp:892
-#: src/gui/statuswindow.cpp:905
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:675 src/gui/statuswindow.cpp:707
-#: src/gui/statuswindow.cpp:794
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:686
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:689
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:692
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:695 src/gui/statuswindow.cpp:824
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:698
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:902
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:720
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:723
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:726
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:740
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:743 src/gui/statuswindow.cpp:815
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:756 src/gui/statuswindow.cpp:830
-#: src/gui/statuswindow.cpp:883
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:772 src/gui/statuswindow.cpp:797
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:821
-#: src/gui/statuswindow.cpp:886
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:784 src/gui/statuswindow.cpp:853
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:800 src/gui/statuswindow.cpp:859
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:827
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:844
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:850
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:856
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:873 src/gui/statuswindow.cpp:899
-msgid "(O)"
-msgstr ""
-
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
-msgstr ""
+msgstr "Nessun target"
 
 #: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr ""
+msgstr "Permetti target"
 
 #: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
-msgstr ""
+msgstr "Target richiesto"
 
 #: src/gui/textcommandeditor.cpp:120
 msgid "General Magic"
-msgstr ""
+msgstr "Magia"
 
 #: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr ""
+msgstr "Magia della vita"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr ""
+msgstr "Magia della guerra"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr ""
+msgstr "Magia della transmutazione"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr ""
+msgstr "Magia della natura"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
-msgstr ""
+msgstr "Magia astrale"
 
 #: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
-msgstr ""
+msgstr "Editor dei comandi"
 
 #: src/gui/textcommandeditor.cpp:185
 msgid "magic"
-msgstr ""
+msgstr "magia"
 
 #: src/gui/textcommandeditor.cpp:189
 msgid "other"
-msgstr ""
+msgstr "altro"
 
 #: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
-msgstr ""
+msgstr "Simbolo:"
 
 #: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr ""
+msgstr "Comando:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
@@ -3390,31 +3013,31 @@ msgstr ""
 
 #: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
 
 #: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
-msgstr ""
+msgstr "Tipo di target:"
 
 #: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
-msgstr ""
+msgstr "Icona:"
 
 #: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
-msgstr ""
+msgstr "Livello magico:"
 
 #: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
-msgstr ""
+msgstr "Scuola di magia:"
 
 #: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
-msgstr ""
+msgstr "Livello scuola:"
 
 #: src/gui/textcommandeditor.cpp:238
 msgid "Save"
-msgstr ""
+msgstr "Salva"
 
 #: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
@@ -3439,7 +3062,7 @@ msgstr "Commercia: Tu"
 #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
-msgstr ""
+msgstr "Ottieni %s"
 
 #: src/gui/tradewindow.cpp:112
 msgid "You give:"
@@ -3465,33 +3088,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Aggiornamento..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Gioca"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1  riprova più tardi"
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Completato"
 
@@ -3501,19 +3124,19 @@ msgstr "Essere"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
-msgstr ""
+msgstr "Nomi amici"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr ""
+msgstr "Nomi disprezzati"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr ""
+msgstr "Nomi ignorati"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr ""
+msgstr "Nomi cancellati"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3533,19 +3156,19 @@ msgstr "NPCs"
 
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
-msgstr ""
+msgstr "Barra HP dei nemici"
 
 #: src/gui/userpalette.cpp:128
 msgid "Monster HP bar (second color)"
-msgstr ""
+msgstr "Barra HP dei nemici (secondo colore)"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr ""
+msgstr "Membri del gruppo"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
-msgstr ""
+msgstr "Membri della gilda"
 
 #: src/gui/userpalette.cpp:131
 msgid "Particle Effects"
@@ -3553,7 +3176,7 @@ msgstr "Effetti particelle"
 
 #: src/gui/userpalette.cpp:132
 msgid "Pickup Notification"
-msgstr ""
+msgstr "Notifica oggetti raccolti"
 
 #: src/gui/userpalette.cpp:133
 msgid "Exp Notification"
@@ -3561,23 +3184,23 @@ msgstr "Notifica Esperienza"
 
 #: src/gui/userpalette.cpp:134
 msgid "Player HP bar"
-msgstr ""
+msgstr "Barra HP del giocatore"
 
 #: src/gui/userpalette.cpp:136
 msgid "Player HP bar (second color)"
-msgstr ""
+msgstr "Barra HP del giocatore (secondo colore)"
 
 #: src/gui/userpalette.cpp:137
 msgid "Player Hits Monster"
-msgstr ""
+msgstr "Il giocatore colpisce il nemico"
 
 #: src/gui/userpalette.cpp:138
 msgid "Monster Hits Player"
-msgstr ""
+msgstr "Il nemico colpisce il giocatore"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "Altro giocatore colpisce giocatore vicino"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3585,15 +3208,15 @@ msgstr "Colpo critico"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "Il giocatore colpisce il nemico"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "Il giocatore infligge un colpo critico"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
-msgstr ""
+msgstr "Il giocatore manca il nemico"
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
@@ -3601,7 +3224,7 @@ msgstr "Perde"
 
 #: src/gui/userpalette.cpp:149
 msgid "Portal Highlight"
-msgstr ""
+msgstr "Evidenzia portali"
 
 #: src/gui/userpalette.cpp:151
 msgid "Default collision Highlight"
@@ -3621,15 +3244,15 @@ msgstr ""
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Raggio d'attacco del giocatore"
 
 #: src/gui/userpalette.cpp:161
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Raggio d'attacco del nemico"
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
-msgstr ""
+msgstr "Raggio d'attacco del nemico"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
@@ -3643,29 +3266,29 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "Chi è online - Aggiornamento in corso"
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
-msgstr ""
+msgstr "Aggiornamento"
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
-msgstr ""
+msgstr "Chi è online -   "
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "Chi è online - errore"
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "Chi è online - aggiornamento"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
-msgstr ""
+msgstr "Battaglia"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
@@ -3763,7 +3386,7 @@ msgstr "Annuncio generale da %s:"
 #: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s sussurra: %s "
 
 #: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
 #: src/net/ea/gui/partytab.cpp:83
@@ -3806,11 +3429,11 @@ msgstr "Modifica"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Ignora l'altro giocatore"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Smetti di ignorare l'altro giocatore"
 
 #: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
@@ -3826,11 +3449,12 @@ msgstr "Questo comando chiude la scheda del sussurro attiva."
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Comando: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
+"Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3840,26 +3464,28 @@ msgstr "Comando: /unignore <giocatore>"
 msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Questo comando smette di ignorare l'altro giocatore se è stato ignorato in "
+"precedenza"
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
-msgstr ""
+msgstr "BC"
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
-msgstr ""
+msgstr "Bot checker"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr ""
+msgstr "Chi è online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
-msgstr ""
+msgstr "KS"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
@@ -3867,7 +3493,7 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
-msgstr ""
+msgstr "STA"
 
 #: src/gui/windowmenu.cpp:73
 msgid "Status"
@@ -3875,39 +3501,39 @@ msgstr "Stato"
 
 #: src/gui/windowmenu.cpp:74
 msgid "EQU"
-msgstr ""
+msgstr "EQU"
 
 #: src/gui/windowmenu.cpp:76
 msgid "INV"
-msgstr ""
+msgstr "INV"
 
 #: src/gui/windowmenu.cpp:81
 msgid "SKI"
-msgstr ""
+msgstr "SKI"
 
 #: src/gui/windowmenu.cpp:88
 msgid "SPE"
-msgstr ""
+msgstr "SPE"
 
 #: src/gui/windowmenu.cpp:93
 msgid "SOC"
-msgstr ""
+msgstr "SOC"
 
 #: src/gui/windowmenu.cpp:94
 msgid "SH"
-msgstr ""
+msgstr "SH"
 
 #: src/gui/windowmenu.cpp:94
 msgid "Shortcuts"
-msgstr ""
+msgstr "Shortcuts"
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
-msgstr ""
+msgstr "SP"
 
 #: src/gui/windowmenu.cpp:97
 msgid "DR"
-msgstr ""
+msgstr "DR"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
@@ -3919,19 +3545,19 @@ msgstr ""
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "SET"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
-msgstr ""
+msgstr "Seleziona parola"
 
 #: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr ""
+msgstr "Cambia login"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr ""
+msgstr "Scegli parola"
 
 #: src/inventory.cpp:251
 msgid "Storage"
@@ -3967,7 +3593,7 @@ msgstr "Mirino e attacco"
 
 #: src/keyboardconfig.cpp:52
 msgid "Move to Target"
-msgstr ""
+msgstr "Muovi all'obbiettivo"
 
 #: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
@@ -3995,7 +3621,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
-msgstr ""
+msgstr "Seleziona il più vicino"
 
 #: src/keyboardconfig.cpp:68
 msgid "Target NPC"
@@ -4011,7 +3637,7 @@ msgstr "Raccogli"
 
 #: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
-msgstr ""
+msgstr "Cambia modo di raccogliere"
 
 #: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
@@ -4031,7 +3657,7 @@ msgstr "Abilita/Disabilita Scambi"
 
 #: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "Cambia visualiz. mappa"
 
 #: src/keyboardconfig.cpp:82
 msgid "Select OK"
@@ -4341,11 +3967,11 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
-msgstr ""
+msgstr "On / Off audio"
 
 #: src/keyboardconfig.cpp:344
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "Abilita / Disabilita modalità away"
 
 #: src/keyboardconfig.cpp:346
 msgid "Emulate right click from keyboard"
@@ -4365,161 +3991,433 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
+"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
+"inconvenienti"
 
-#: src/localplayer.cpp:389
-msgid "You were killed by "
+#: src/localplayer.cpp:384
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
-msgstr ""
+msgstr "L'oggetto è troppo pesante"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr ""
 
 #: src/localplayer.cpp:1448
 msgid "Inventory is full."
-msgstr ""
+msgstr "L'inventario è pieno"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1480
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hai raccolto %d  [@@%d|%s@@]."
+msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3206
+#: src/localplayer.cpp:1898
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1899
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1900
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1901
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1902
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1903
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1925
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1930
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1948
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1949
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1950
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1951
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1952
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1953
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1954
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1955
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1956
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1975
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1976
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1977
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1978
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1979
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2000
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2001
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2022
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2023
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2024
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2058
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2059
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2060
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2061
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2062
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2063
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2064
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2065
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2078
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2079
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2080
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2081
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2082
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2083
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2102
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2103
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2104
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2126
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2127
+msgid "(f) attack not friends"
+msgstr ""
+
+#: src/localplayer.cpp:2128
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(d) dont attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2149
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2150
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2151
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2179
 msgid "Away"
+msgstr "Assente"
+
+#: src/localplayer.cpp:2198
+msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:3541
+#: src/localplayer.cpp:2199
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2213
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2214
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2239
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2240
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3543 src/localplayer.cpp:3558
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3550
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3552 src/localplayer.cpp:3560
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3908
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Opzioni"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4535,71 +4433,75 @@ msgstr "Grazie per l'acquisto."
 msgid "Unable to buy."
 msgstr "Impossibile acquistare."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informazioni"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4644,16 +4546,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4743,11 +4645,11 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
@@ -4824,15 +4726,15 @@ msgstr ""
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -4840,15 +4742,15 @@ msgstr ""
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4870,60 +4772,60 @@ msgstr ""
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr ""
+msgstr "La vecchia password è sbagliata."
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr ""
+msgstr "Errore sconosciuto."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr ""
 
@@ -4965,16 +4867,16 @@ msgstr ""
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
@@ -4998,7 +4900,7 @@ msgstr "Le fredde mani della morte stanno afferrando la tua anima."
 
 #: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
-msgstr ""
+msgstr "Game Over!"
 
 #: src/net/ea/playerhandler.cpp:102
 msgid "Insert coin to continue."
@@ -5026,7 +4928,7 @@ msgstr "Suppongo non sia andata troppo bene."
 
 #: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
-msgstr ""
+msgstr "Vuoi che i tuoi beni siano identificati?"
 
 #: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
@@ -5044,6 +4946,8 @@ msgstr ""
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
+"Hai combinato un altro disastro, getta il tuo corpo nelle fogne e prenditene"
+" uno nuovo."
 
 #: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
@@ -5267,103 +5171,103 @@ msgstr "Scambio cancellato."
 msgid "Trade completed."
 msgstr "Scambio completato."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Forza"
 
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr ""
+msgstr "Forza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Agilità"
 
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr ""
+msgstr "Agilità %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Destrezza"
 
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr ""
+msgstr "Destrezza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalità"
 
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr ""
+msgstr "Vitalità %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligenza"
 
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr ""
+msgstr "Intelligenza %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
-msgstr ""
+msgstr "Forza di volontà"
 
 #: src/net/manaserv/attributes.cpp:232
 #, c-format
 msgid "Willpower %+.1f"
-msgstr ""
+msgstr "Forza di volontà %+.1f"
 
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr ""
+msgstr "Premi OK per resuscitare."
 
 #: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr ""
+msgstr "Sei morto"
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr ""
+msgstr "Non registrato"
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
-msgstr ""
+msgstr "Nessuno spazio libero"
 
 #: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr ""
+msgstr "Nome non valido."
 
 #: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr ""
+msgstr "Il nome del personaggio esiste già."
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Pettinatura non valida."
 
 #: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Colore dei capelli non valido."
 
 #: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr ""
+msgstr "Genere non valido."
 
 #: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr ""
+msgstr "Le statistiche del personaggio sono troppo alte."
 
 #: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr ""
+msgstr "Le statistiche del personaggio sono troppo basse."
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
@@ -5372,11 +5276,11 @@ msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
-msgstr ""
+msgstr "Numero dello slot non valido."
 
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr ""
+msgstr "Personaggio cancellato."
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
@@ -5385,7 +5289,7 @@ msgstr ""
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr ""
+msgstr "Errore sconosciuto (%d)."
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -5395,11 +5299,11 @@ msgstr "Nessun gameserver è disponibile."
 #: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
-msgstr ""
+msgstr "Argomento: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "Giocatori su questo canale:"
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
@@ -5411,27 +5315,27 @@ msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
-msgstr ""
+msgstr "Fine della lista dei canali."
 
 #: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
-msgstr ""
+msgstr "%s è entrato nel canale."
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s ha lasciato il canale."
 
 #: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s ha impostato la modalità %s sul giocatore %s."
 
 #: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s ha scacciato %s."
 
 #: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
@@ -5447,11 +5351,11 @@ msgstr "Invito spedito."
 
 #: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
-msgstr ""
+msgstr "Membro promosso con successo."
 
 #: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
-msgstr ""
+msgstr "Promozione membro fallita."
 
 #: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
@@ -5463,27 +5367,27 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:99
 msgid "Account banned."
-msgstr ""
+msgstr "Account bannato."
 
 #: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr ""
+msgstr "La nuova password è sbagliata."
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
-msgstr ""
+msgstr "L'account non è connesso. Connettere prima."
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr ""
+msgstr "Il nuovo indirizzo email è sbagliato."
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr ""
+msgstr "Il vecchio indirizzo email è sbagliato."
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr ""
+msgstr "Il nuovo indirizzo email esiste già."
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
@@ -5496,27 +5400,28 @@ msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr ""
+msgstr "Username o password sbagliati."
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
-msgstr ""
+msgstr "Account bannato."
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
+"Il tentativo di login è stato fatto troppo presto dopo l'ultimo tentativo."
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr ""
+msgstr "Username, password o indirizzo email sbagliati."
 
 #: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr ""
+msgstr "Username già in uso."
 
 #: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr ""
+msgstr "L'indirizzo email esiste già."
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -5524,7 +5429,7 @@ msgstr ""
 
 #: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
-msgstr ""
+msgstr "Iscritto al gruppo."
 
 #: src/net/manaserv/partyhandler.cpp:108
 #, c-format
@@ -5534,7 +5439,7 @@ msgstr "%s si è unito al party."
 #: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
-msgstr ""
+msgstr "%s ha riggettato il tuo invito."
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -5567,11 +5472,11 @@ msgstr "Impossibile vendere."
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Impossibile vendere durante uno scambio."
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "Impossibile vendere oggetti non vendibili."
 
 #: src/net/tmwa/generalhandler.cpp:108
 #, c-format
@@ -5605,80 +5510,80 @@ msgstr "Fortuna %+d"
 
 #: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
-msgstr ""
+msgstr "Autenticazione fallita."
 
 #: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
-msgstr ""
+msgstr "Nessun server disponibile."
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "Qualcun altro sta provando ad usare questo account."
 
 #: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
-msgstr ""
+msgstr "Questo account è già registrato."
 
 #: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Rilevato speed hack."
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
-msgstr ""
+msgstr "Accesso duplicato"
 
 #: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
-msgstr ""
+msgstr "Errore di connessione sconosciuto."
 
 #: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Fortuna"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
-msgstr ""
+msgstr "Difesa."
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
-msgstr ""
+msgstr "Attacco magico."
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
-msgstr ""
+msgstr "Difesa Magica."
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
-msgstr ""
+msgstr "% Accuratezza"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
-msgstr ""
+msgstr "% Evasione"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
-msgstr ""
+msgstr "% Colpo critico"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
@@ -5699,48 +5604,48 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr "%s non è nel tuo party!"
 
-#: src/playerrelations.cpp:460
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:524
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:527
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
-msgstr ""
+msgstr "senza nome"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Attacco %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Difesa %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "PF %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
diff --git a/po/ja.po b/po/ja.po
index d43a80c8a..b4b7bb429 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,6 +4,7 @@
 #
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
+#   <HarajukuCupcakes@gmail.com>, 2011, 2012.
 # Necromonger <Necromong@inbox.ru>, 2011.
 #   <Necromong@inbox.ru>, 2011.
 # sn0w75 <ibenrunnin@gmail.com>, 2011.
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
 "Language: ja\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: src/actorspritemanager.cpp:1169
 msgid "Visible on map"
-msgstr ""
+msgstr "マップに表示させる"
 
 #: src/being.cpp:553
 msgid "dodge"
@@ -37,351 +38,350 @@ msgstr "ミス"
 #. TRANSLATORS: this away status writed in player nick
 #: src/being.cpp:1534
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
 #: src/being.cpp:1539
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
-msgstr ""
+msgstr "パフォーマンス"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
-msgstr ""
+msgstr "テーマ"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
-msgstr "サーバー通信中…"
+msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
-msgstr "ログイン中…"
+msgstr "ログインしています"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
-msgstr "ゲームの世界に入る中"
+msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
-msgstr "服：％d"
+msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
-msgstr "ゲームサーバー通信中…"
+msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
-msgstr "サーバーを入り替え中…"
+msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
-msgstr "登録細目を要請中"
+msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
-msgstr "パスワード変更成功！"
+msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
-msgstr "メール変更"
+msgstr "メールアドレス変更"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
-msgstr "メール変更成功！"
+msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
-msgstr "登録解除成功"
+msgstr "登録を解除しました"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
-msgstr "さよなら、いつでも戻ってね..."
+msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr "%s は存在しないので作成することが不可能！終了中…"
+msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
-msgstr "無効なアップデートホスト:  %s"
+msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
+msgstr "エラー: %s は存在しない為、作成できません"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
-msgstr "不明なコマンド"
+msgstr "不明なコマンドです"
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
-msgstr "空のメッセージを送信することはできません！"
+msgstr "空のささやきを送信することはできません"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
-"%sと言うメッセージタブの作成ができません！それはもう既に存在しているか、自分"
-"です。"
+"%sへのささやきタブの作成に失敗しました。そのタブは既に開いている、もしくは自"
+"分宛てです"
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
-msgstr "%sというチャンネルへの参加を要求しています。"
+msgstr "%sチャンネルへの参加をリクエスト中"
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
-msgstr "パーティ名がない。"
+msgstr "パーティ名がありません"
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
-msgstr "ギルド名がない。"
+msgstr "ギルド名がありません"
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
-msgstr "名前を教えてください。"
+msgstr "名前を入力してください"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
-msgstr "リターンはチャットを留めておきます。"
+msgstr "改行キーでチャット入力ができます"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
-msgstr "メッセージはチャットを閉じます。"
+msgstr "チャットを閉じます"
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
-msgstr "リターンはこれからチャットを留めておきます。"
+msgstr "改行キーでチャット入力ができます"
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
-msgstr "メッセージはこれからチャットを閉じます。"
+msgstr "チャットを閉じます"
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "友達"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
-msgstr "プレイヤーはもう%s!"
+msgstr "プレイヤーは既に%s"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
-msgstr "プレイヤーは%s成功！"
+msgstr "プレイヤーの%sに成功しました"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
-msgstr "選手は%sを居られなかった "
+msgstr "プレイヤーを%sできなかった"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
-msgstr "プレイヤーは無視されなかった！"
+msgstr "プレイヤーを無視できませんでした"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
-msgstr "プレイヤーはもう無視していない！"
+msgstr "プレイヤーを無視解除しました"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
-msgstr "Playerはunignoredことができなかった！"
+msgstr "プレイヤーを無視解除できませんでした"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
-msgstr ""
+msgstr "ブラックリスト化されています"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
-msgstr ""
+msgstr "敵"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
-msgstr "プレイヤーはもう消している!"
+msgstr "プレイヤーは削除されています"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
-msgstr "プレーアが首尾よくに消去！"
+msgstr "プレイヤーを削除しました"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
-msgstr ""
+msgstr "プレイヤーを削除できませんでした"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
-msgstr "クライアントの稼働時間：%s"
+msgstr "クライアントの稼働時間: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
+msgstr[0] "%d週"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
+msgstr[0] "%d日"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
+msgstr[0] "%d時"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
+msgstr[0] "%d分"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
+msgstr[0] "%d秒"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
-msgstr ""
+msgstr "フォントキャッシュサイズ"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
-msgstr ""
+msgstr "キャッシュサイズ:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
-msgstr ""
+msgstr "作成:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
-msgstr ""
+msgstr "削除:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
-msgstr ""
+msgstr "リソースイメージ:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
-msgstr ""
+msgstr "リソース孤児イメージ:"
 
 #: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"。"
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
-msgstr ""
+msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
-msgstr "スクリーンショットを保存することに失敗しました！"
+msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
-msgstr ""
+msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
-msgstr "他人からのトレードリクエストを無視します。"
+msgstr "トレードリクエストを無効にしています"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
-msgstr "他人からのトレードリクエストを受け入れます。"
+msgstr "トレードリクエストを有効にしました"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
-msgstr "マップをロードできませんでした"
+msgstr "マップの読み込みに失敗しました"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
-msgstr "%sをロードしている間にエラーが起きました。"
+msgstr "%sの読み込み中にエラーが起きました"
 
 #: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
-msgstr "パーティ：%s"
+msgstr "パーティ: %s"
 
 #: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
-msgstr "ギルド：%s"
+msgstr "ギルド: %s"
 
 #: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
-msgstr "PVP ランク：%d"
+msgstr "PVP ランク: %d"
 
 #: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "コメント: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
-msgstr "ボット"
+msgstr "ボットチェッカー"
 
 #: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
 msgid "Name"
@@ -389,7 +389,7 @@ msgstr "名前"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻撃"
 
@@ -408,7 +408,7 @@ msgstr "動く"
 msgid "Result"
 msgstr "結果"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "リセット"
 
@@ -426,21 +426,21 @@ msgstr "価格:%s /合計:%s"
 
 #: src/gui/buydialog.cpp:103
 msgid "Amount:"
-msgstr ""
+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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -452,8 +452,8 @@ msgid "Quit"
 msgstr "終了"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "最大"
 
@@ -477,20 +477,20 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "キャンセル"
 
 #: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
-msgstr "メールアドレスを変える。"
+msgstr "メールアドレスの変更"
 
 #: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
@@ -499,24 +499,24 @@ msgstr "アカウント: %s"
 
 #: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr "新しいメールアドレスを二回入力してください："
+msgstr "新しいメールアドレスを二回入力してください:"
 
 #: src/gui/changeemaildialog.cpp:132
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "ユーザ名は少なくとも%d文字以上長くなくてはいけません。"
+msgstr "メールアドレスは少なくとも%d文字以上でなくてはいけません"
 
 #: src/gui/changeemaildialog.cpp:139
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "ユーザ名は%d文字より短くなくてはいけません。"
+msgstr "メールアドレスは%d文字以下でなくてはいけません"
 
 #: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr ""
+msgstr "メールアドレスが一致しません"
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "パスワードの変更"
 
@@ -527,29 +527,29 @@ msgstr "パスワード:"
 
 #: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr "新しいパスワードを二回入力してください："
+msgstr "新しいパスワードを二回入力してください:"
 
 #: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr "元のパスワードを入力してください。"
+msgstr "元のパスワードを入力してください"
 
 #: src/gui/changepassworddialog.cpp:120
 #, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "パスワードは少なくとも%d文字以上長くなくてはいけません。"
+msgstr "パスワードは少なくとも%d文字以上でなくてはいけません"
 
 #: src/gui/changepassworddialog.cpp:127
 #, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "パスワードは%d文字より短くなくてはいけません。"
+msgstr "パスワードは%d文字以下でなくてはいけません"
 
 #: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "新しいパスワードが一致しません"
 
 #: src/gui/charcreatedialog.cpp:59
 msgid "Create Character"
-msgstr "キャラクターを作成"
+msgstr "キャラクター作成"
 
 #: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
@@ -572,18 +572,18 @@ msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:92
 msgid "Hair color:"
-msgstr "髪色："
+msgstr "髪色:"
 
 #: src/gui/charcreatedialog.cpp:95
 msgid "Hair style:"
-msgstr "髪スタイル"
+msgstr "ヘアスタイル"
 
 #: src/gui/charcreatedialog.cpp:101
 msgid "Race:"
 msgstr "人種:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "作成"
 
@@ -602,72 +602,72 @@ msgstr "%d ポイントを振り分けてください"
 
 #: src/gui/charcreatedialog.cpp:231
 msgid "Your name needs to be at least 4 characters."
-msgstr "名前には４文字以上必要です。"
+msgstr "名前は４文字以上必要です"
 
 #: src/gui/charcreatedialog.cpp:303
 msgid "Character stats OK"
-msgstr "キャラクターの能力ポイント配分量は問題ありません。"
+msgstr "能力ポイント配分量は問題ありません"
 
 #: src/gui/charcreatedialog.cpp:317
 #, c-format
 msgid "Please remove %d points"
-msgstr "%dポイントを取り除いてください。"
+msgstr "%dポイントを取り除いてください"
 
 #: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
-msgstr "キャラクターの削除してもよいか確認してください"
+msgstr "キャラクター削除の確認をしてください"
 
 #: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
-msgstr "このキャラクターを消してもよろしいでしょうか？"
+msgstr "このキャラクターを削除しますか？"
 
 #: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "アカウントとキャラクター管理"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr "ログインをスイッチする"
+msgstr "別アカウントでログイン"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "登録解除"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
-msgstr "メールアドレスを変える"
+msgstr "メールアドレス変更"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
-msgstr ""
+msgstr "パスワードが違います"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
-msgstr ""
+msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
-msgstr ""
+msgstr "パスワードを入力して下さい:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
-msgstr "選ぶ"
+msgstr "選択"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "レベル%d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
-msgstr "(空っぽ)"
+msgstr "(空)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
 msgid "default"
@@ -691,7 +691,7 @@ msgstr "青"
 
 #: src/gui/chatwindow.cpp:121
 msgid "gold"
-msgstr "金"
+msgstr "金色"
 
 #: src/gui/chatwindow.cpp:122
 msgid "yellow"
@@ -707,7 +707,7 @@ msgstr "紫"
 
 #: src/gui/chatwindow.cpp:125
 msgid "grey"
-msgstr "灰色"
+msgstr "グレー"
 
 #: src/gui/chatwindow.cpp:126
 msgid "brown"
@@ -739,15 +739,15 @@ msgstr "???"
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr ""
+msgstr "現在: %s; %d プレイヤーがいます"
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr "%sに送信中： %s"
+msgstr "%sにささやき中:%s"
 
 #: src/gui/confirmdialog.cpp:47
 msgid "Yes"
@@ -770,49 +770,49 @@ msgstr "無視"
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
 #: src/gui/setup_other.cpp:64
 msgid "Map"
-msgstr "地図"
+msgstr "マップ"
 
 #: src/gui/debugwindow.cpp:73
 msgid "Target"
-msgstr ""
+msgstr "ターゲット"
 
 #: src/gui/debugwindow.cpp:74
 msgid "Net"
-msgstr ""
+msgstr "ネット"
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:251
 msgid "Music:"
-msgstr "音楽："
+msgstr "音楽:"
 
 #: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
 #: src/gui/debugwindow.cpp:253
 msgid "Map:"
-msgstr "マップ："
+msgstr "マップ:"
 
 #: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
 #: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
-msgstr "ミニマップ："
+msgstr "ミニマップ:"
 
 #: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
-msgstr "カーソル："
+msgstr "カーソル:"
 
 #: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
 #: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
-msgstr "プレイヤーポジション："
+msgstr "プレイヤーの位置:"
 
 #: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
-msgstr ""
+msgstr "パーティクル数:"
 
 #: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
 #: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
-msgstr "数量のマプの行為者:"
+msgstr "マップアクターの数:"
 
 #: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
@@ -836,67 +836,67 @@ msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
-msgstr ""
+msgstr "テクスチャー数:"
 
 #: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
-msgstr "粒子数： %d"
+msgstr "パーティクル数:%d"
 
 #: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
 #: src/gui/debugwindow.cpp:345
 msgid "Target:"
-msgstr "ターゲット："
+msgstr "ターゲット:"
 
 #: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
 #: src/gui/debugwindow.cpp:346
 msgid "Target Id:"
-msgstr "ターゲットID："
+msgstr "ターゲットID:"
 
 #: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
 #: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
 msgid "Target Level:"
-msgstr "ターゲットレベル："
+msgstr "ターゲットレベル:"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
 #: src/gui/debugwindow.cpp:348
 msgid "Target Party:"
-msgstr "ターゲットパーティ："
+msgstr "ターゲットパーティ:"
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
 #: src/gui/debugwindow.cpp:349
 msgid "Target Guild:"
-msgstr "ターゲットギルド："
+msgstr "ターゲットギルド:"
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
 #: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
 msgid "Attack delay:"
-msgstr ""
+msgstr "攻撃遅延"
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:351
 msgid "Minimal hit:"
-msgstr ""
+msgstr "最低ヒット:"
 
 #: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:352
 msgid "Maximum hit:"
-msgstr ""
+msgstr "最高ヒット:"
 
 #: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
 #: src/gui/debugwindow.cpp:353
 msgid "Critical hit:"
-msgstr ""
+msgstr "致命的ヒット:"
 
 #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "ピング: %s ms"
 
 #: src/gui/debugwindow.cpp:395
 #, c-format
 msgid "In: %d bytes/s"
-msgstr "入力: %d バイト/秒"
+msgstr "入力: %dバイト/秒"
 
 #: src/gui/debugwindow.cpp:397
 #, c-format
@@ -905,25 +905,25 @@ msgstr "出力: %d バイト/秒"
 
 #: src/gui/didyouknowwindow.cpp:47
 msgid "Did You Know?"
-msgstr ""
+msgstr "豆知識"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "閉じる"
 
 #: src/gui/didyouknowwindow.cpp:64
 msgid "< Previous"
-msgstr ""
+msgstr "< 前へ"
 
 #: src/gui/didyouknowwindow.cpp:65
 msgid "Next >"
-msgstr ""
+msgstr "次へ >"
 
 #: src/gui/didyouknowwindow.cpp:66
 msgid "Auto open this window"
-msgstr ""
+msgstr "この窓を自動で開ける"
 
 #: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
@@ -932,14 +932,14 @@ msgstr "OK"
 
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
-msgstr "装備"
+msgstr "装着品"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
-msgstr "外す"
+msgstr "取外す"
 
 #: src/gui/helpwindow.cpp:43
 msgid "Help"
@@ -947,82 +947,82 @@ msgstr "ヘルプ"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "名前"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "ID"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "重量"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "数量"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "タイプ"
 
 #: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
 msgid "Inventory"
-msgstr "アイテム"
+msgstr "インベントリー"
 
 #: src/gui/inventorywindow.cpp:137
 msgid "Slots:"
-msgstr "スロット"
+msgstr "スロット:"
 
 #: src/gui/inventorywindow.cpp:149
 msgid "Filter:"
-msgstr "フィルタ："
+msgstr "フィルタ:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
-msgstr "装備する"
+msgstr "装着"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
-msgstr "使う"
+msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
-msgstr "分割する"
+msgstr "分割"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
 #: src/gui/popupmenu.cpp:588
 msgid "Outfits"
-msgstr "服"
+msgstr "服装"
 
 #: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
-msgstr "重量"
+msgstr "重量:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
-msgstr "保存"
+msgstr "保管"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
-msgstr "取り戻す"
+msgstr "取出す"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1033,90 +1033,90 @@ msgstr "全て"
 
 #: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
-msgstr "交換するアイテムの量を選択してください。"
+msgstr "トレードするアイテムの数量を入力してください"
 
 #: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
-msgstr "落とすアイテムの量を選択してください"
+msgstr "落とすアイテムの数量を入力してください"
 
 #: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
-msgstr "保管するアイテムの量を選択してください。"
+msgstr "保管するアイテムの数量を入力してください"
 
 #: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
-msgstr "取り出すアイテムの量を選択してください。"
+msgstr "取出すアイテムの数量を入力してください"
 
 #: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
-msgstr "分割するアイテムの量を選択してください。"
+msgstr "分割するアイテムの量を選択してください"
 
 #: src/gui/itemamountwindow.cpp:276
 msgid "Add to buy shop."
-msgstr ""
+msgstr "購入リストに追加"
 
 #: src/gui/itemamountwindow.cpp:279
 msgid "Add to sell shop."
-msgstr ""
+msgstr "販売リストに追加"
 
 #: src/gui/itemamountwindow.cpp:282
 msgid "Unknown."
-msgstr "不明."
+msgstr "不明"
 
 #: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
-msgstr "、　"
+msgstr ", "
 
 #: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
-msgstr "重力：%s"
+msgstr "重力: %s"
 
 #: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
-msgstr "殺人統計ウィンドウ"
+msgstr "キル統計"
 
 #: src/gui/killstats.cpp:67
 msgid "Reset stats"
-msgstr "統計をれセット"
+msgstr "統計をリセット"
 
 #: src/gui/killstats.cpp:68
 msgid "Reset timer"
-msgstr "タイマーをれセット"
+msgstr "タイマーをリセット"
 
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "レベル: %d と %f%%"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d/%d 残り: %d"
 
 #: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
 #: src/gui/killstats.cpp:228
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d exp, 平均の敵 1%%: %s"
 
 #: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
 #: src/gui/killstats.cpp:237
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "キル: %s, 合計exp: %s"
 
 #: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
 #: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "平均Exp: %s, 次のレベル達成までの敵の数: %s"
 
 #: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
 #: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "キル/分: %s, Exp/分: %s"
 
 #: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
@@ -1124,43 +1124,43 @@ msgstr ""
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
+msgstr[0] "Expスピード %d 分ごと: %s"
 
 #: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
-msgstr[0] ""
+msgstr[0] "次のレベルアップ %d 分ごと: %s"
 
 #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
-msgstr ""
+msgstr "最後のExp:"
 
 #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
 #: src/gui/killstats.cpp:375
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "次のJackOの出現まで:"
 
 #: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
 #: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
 #: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "  次のレベル達成までの時間: %s"
 
 #: src/gui/killstats.cpp:364
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
 
 #: src/gui/killstats.cpp:370
 msgid "jacko spawning"
-msgstr ""
+msgstr "JackOが出現中"
 
 #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
 msgid "You have left the guild."
-msgstr ""
+msgstr "ギルドから退会しました"
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
@@ -1168,7 +1168,7 @@ msgstr "普通"
 
 #: src/gui/logindialog.cpp:60
 msgid "Auto Close"
-msgstr "オートクローズ"
+msgstr "自動で閉じる"
 
 #: src/gui/logindialog.cpp:61
 msgid "Skip"
@@ -1181,27 +1181,27 @@ msgstr "ログイン"
 #: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
-msgstr "サーバ:"
+msgstr "サーバー:"
 
 #: src/gui/logindialog.cpp:96
 msgid "Custom update host"
-msgstr "カスタム・アップデート・ホスト"
+msgstr "カスタムアップデートホスト"
 
 #: src/gui/logindialog.cpp:110
 msgid "Remember username"
-msgstr "ウザー名を覚える"
+msgstr "ユーザー名を記憶する"
 
 #: src/gui/logindialog.cpp:111
 msgid "Update:"
-msgstr "アップデート"
+msgstr "アップデート:"
 
 #: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
-msgstr "登録する"
+msgstr "登録"
 
 #: src/gui/logindialog.cpp:122
 msgid "Change Server"
-msgstr "サーバーを変える"
+msgstr "サーバー変更"
 
 #: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
@@ -1225,7 +1225,7 @@ msgstr "重量"
 
 #: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
-msgstr ""
+msgstr "インベントリースロットバー"
 
 #: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
@@ -1243,31 +1243,27 @@ msgstr "情勢"
 msgid "Need"
 msgstr "必要"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "サーバを待っています…"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "キャンセル"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
-msgstr "次へ"
+msgstr "次"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "決定"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "クリア"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> 次の"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "宛先:"
@@ -1278,25 +1274,26 @@ msgstr "送信する"
 
 #: src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
-msgstr "文字か差出人が無効なので送信に失敗しました。"
+msgstr "文字か差出人が無効の為送信に失敗しました"
 
 #: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
 #, c-format
 msgid "Outfit: %d"
-msgstr "服： %d"
+msgstr "服装: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
-msgstr "鍵：%s"
+msgstr "鍵: %s"
 
 #: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
-msgstr "外す第一"
+msgstr "最初に取外す"
 
 #: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
-msgstr "装備一式不在で"
+msgstr "AFK中の服装"
 
 #: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
 #: src/gui/widgets/tradetab.cpp:44
@@ -1305,16 +1302,16 @@ msgstr "交換"
 
 #: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
 msgid "Whisper"
-msgstr ""
+msgstr "ささやく"
 
 #: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
 msgid "Heal"
-msgstr ""
+msgstr "HP回復"
 
 #: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
 #: src/gui/popupmenu.cpp:682
 msgid "Be friend"
-msgstr ""
+msgstr "友達になる"
 
 #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
@@ -1325,7 +1322,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714
 #: src/gui/popupmenu.cpp:727
 msgid "Disregard"
-msgstr ""
+msgstr "無視する"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
 #: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
@@ -1333,7 +1330,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693
 #: src/gui/popupmenu.cpp:716
 msgid "Black list"
-msgstr ""
+msgstr "ブラックリスト"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
 #: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415
@@ -1341,7 +1338,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr ""
+msgstr "敵に設定する"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1353,7 +1350,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709
 #: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722
 msgid "Erase"
-msgstr ""
+msgstr "消す"
 
 #: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
 #: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187
@@ -1364,106 +1361,106 @@ msgstr ""
 #: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721
 #: src/gui/popupmenu.cpp:726
 msgid "Unignore"
-msgstr ""
+msgstr "無視解除"
 
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "完全無視"
 
 #: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
 #: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
 msgid "Follow"
-msgstr ""
+msgstr "フォロー"
 
 #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
 #: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Imitation"
-msgstr ""
+msgstr "真似"
 
 #: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
 msgid "Invite to party"
-msgstr ""
+msgstr "パーティへ招待"
 
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
 #: src/gui/popupmenu.cpp:774
 msgid "Kick from party"
-msgstr ""
+msgstr "パーティから一時的に追い出す"
 
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
 #: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
 msgid "Kick from guild"
-msgstr ""
+msgstr "ギルドから一時的に追い出す"
 
 #: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
 #: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
 msgid "Change pos in guild"
-msgstr ""
+msgstr "ギルドでの役割を変更"
 
 #: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
 #: src/gui/popupmenu.cpp:805
 msgid "Invite to guild"
-msgstr ""
+msgstr "ギルドへ招待"
 
 #: src/gui/popupmenu.cpp:265
 msgid "Kick player"
-msgstr ""
+msgstr "プレイヤーを一時的に追い出す"
 
 #: src/gui/popupmenu.cpp:267
 msgid "Nuke"
-msgstr ""
+msgstr "消す"
 
 #: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
 #: src/gui/popupmenu.cpp:828
 msgid "Show Items"
-msgstr ""
+msgstr "アイテムを表示する"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
-msgstr ""
+msgstr "脱ぐ"
 
 #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301
 #: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741
 #: src/gui/popupmenu.cpp:830
 msgid "Add comment"
-msgstr ""
+msgstr "コメントをする"
 
 #: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
 #: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
 msgid "Buy (?)"
-msgstr ""
+msgstr "買う (?)"
 
 #: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
 #: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Sell (?)"
-msgstr ""
+msgstr "売る (?)"
 
 #: src/gui/popupmenu.cpp:312
 msgid "Kick"
-msgstr ""
+msgstr "追い出す"
 
 #: src/gui/popupmenu.cpp:323
 msgid "Remove from attack list"
-msgstr ""
+msgstr "攻撃リストから削除する"
 
 #: src/gui/popupmenu.cpp:328
 msgid "Add to priority attack list"
-msgstr ""
+msgstr "攻撃優先リストへ追加する"
 
 #: src/gui/popupmenu.cpp:330
 msgid "Add to attack list"
-msgstr ""
+msgstr "攻撃リストへ追加する"
 
 #: src/gui/popupmenu.cpp:332
 msgid "Add to ignore list"
-msgstr ""
+msgstr "無視リストへ追加する"
 
 #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
 msgid "Add name to chat"
-msgstr ""
+msgstr "名前をチャットへ追加する"
 
 #: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
 msgid "Players"
@@ -1471,10 +1468,10 @@ msgstr "プレイヤー"
 
 #: src/gui/popupmenu.cpp:546
 msgid "Pick up"
-msgstr ""
+msgstr "拾う"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "チャットに追加"
 
@@ -1484,20 +1481,20 @@ msgstr "マップアイテム"
 
 #: src/gui/popupmenu.cpp:567
 msgid "Rename"
-msgstr ""
+msgstr "名前を変更する"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
-msgstr "取り去る"
+msgstr "削除"
 
 #: src/gui/popupmenu.cpp:573
 msgid "Warp"
-msgstr ""
+msgstr "ワープ"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr ""
+msgid "Clear outfit"
+msgstr "服装を削除する"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1505,11 +1502,11 @@ msgstr "呪文"
 
 #: src/gui/popupmenu.cpp:609
 msgid "Load old spells"
-msgstr ""
+msgstr "古い呪文を読込む"
 
 #: src/gui/popupmenu.cpp:610
 msgid "Edit spell"
-msgstr ""
+msgstr "呪文を編集する"
 
 #: src/gui/popupmenu.cpp:636
 msgid "Disable highlight"
@@ -1521,142 +1518,142 @@ msgstr "強調表示を有効"
 
 #: src/gui/popupmenu.cpp:640
 msgid "Don't remove name"
-msgstr ""
+msgstr "名前を消さない"
 
 #: src/gui/popupmenu.cpp:642
 msgid "Remove name"
-msgstr ""
+msgstr "名前を削除する"
 
 #: src/gui/popupmenu.cpp:644
 msgid "Enable away"
-msgstr ""
+msgstr "AFKを有効にする"
 
 #: src/gui/popupmenu.cpp:646
 msgid "Disable away"
-msgstr ""
+msgstr "AFKを無効にする"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
-msgstr "でる"
+msgstr "退会"
 
 #: src/gui/popupmenu.cpp:654
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "クリップボードにコピー"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
-msgstr ""
+msgstr "          マップサインの名前を変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
-msgstr " 名前:   "
+msgstr "名前:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
-msgstr ""
+msgstr "プレイヤーコメント            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
-msgstr ""
+msgstr "コメント:                      "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
-msgstr "に貿易を足す"
+msgstr "トレードに追加"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
-msgstr ""
+msgstr "トレードに10追加する"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
-msgstr ""
+msgstr "トレードに半分追加する"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
-msgstr ""
+msgstr "トレードに全て追加する"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
-msgstr "10保存"
+msgstr "10 保存"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
-msgstr ""
+msgstr "全て落とす"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
-msgstr "10取る"
+msgstr "10 取出す"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
-msgstr "半分取る"
+msgstr "半分取出す"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
-msgstr "全部取る"
+msgstr "全部取出す"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
-msgstr ""
+msgstr "旧アイテムショートカットを読込む"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
-msgstr ""
+msgstr "旧ドロップショートカットを読込む"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
-msgstr " 隠す"
+msgstr " 非表示"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
-msgstr "見せる"
+msgstr "表示"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
-msgstr ""
+msgstr "黄色バーをリセットする"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
-msgstr ""
+msgstr "チャットへコピーする"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
-msgstr ""
+msgstr "上へ移動"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
-msgstr ""
+msgstr "下へ移動"
 
 #: src/gui/quitdialog.cpp:52
 msgid "Switch server"
-msgstr "サーバーを切り替える"
+msgstr "サーバーを変更する"
 
 #: src/gui/quitdialog.cpp:53
 msgid "Switch character"
-msgstr "キャラクターを切り替える"
+msgstr "キャラクターを変更する"
 
 #: src/gui/register.cpp:77
 msgid "Confirm:"
@@ -1664,39 +1661,39 @@ msgstr "確認:"
 
 #: src/gui/register.cpp:108
 msgid "Email:"
-msgstr "Eメール："
+msgstr "Eメール:"
 
 #: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "ユーザ名は少なくとも%d文字以上長くなくてはいけません。"
+msgstr "ユーザー名は少なくとも%d文字以上でなくてはいけません"
 
 #: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
-msgstr "ユーザ名は%d文字より短くなくてはいけません。"
+msgstr "ユーザー名は%d文字以下でなくてはいけません"
 
 #: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
-msgstr "パスワードは少なくとも%d文字以上長くなくてはいけません。"
+msgstr "パスワードは少なくとも%d文字以上でなくてはいけません"
 
 #: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
-msgstr "パスワードは%d文字より短くなくてはいけません。"
+msgstr "パスワードは%d文字以下でなくてはいけません"
 
 #: src/gui/register.cpp:207
 msgid "Passwords do not match."
-msgstr "パスワードが一致していません。"
+msgstr "パスワードが一致しません"
 
 #: src/gui/serverdialog.cpp:237
 msgid "Choose Your Server"
-msgstr "サーバを選ぶ"
+msgstr "サーバーを選択してください"
 
 #: src/gui/serverdialog.cpp:248
 msgid "Choose Your Server  *** SAFE MODE ***"
-msgstr ""
+msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #: src/gui/serverdialog.cpp:253
 msgid "Port:"
@@ -1704,19 +1701,19 @@ msgstr "ポート:"
 
 #: src/gui/serverdialog.cpp:257
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #: src/gui/serverdialog.cpp:271
 msgid "Server type:"
-msgstr "サーバー形"
+msgstr "サーバータイプ:"
 
 #: src/gui/serverdialog.cpp:295
 msgid "Load"
-msgstr "ロード"
+msgstr "読込み"
 
 #: src/gui/serverdialog.cpp:296
 msgid "Connect"
-msgstr "通信"
+msgstr "ログイン"
 
 #: src/gui/serverdialog.cpp:297
 msgid "Custom Server"
@@ -1724,16 +1721,16 @@ msgstr "カスタムサーバー"
 
 #: src/gui/serverdialog.cpp:402
 msgid "Please type both the address and the port of a server."
-msgstr "サーバのアドレスとポート番号を両方入力してください。"
+msgstr "サーバのアドレスとポートを入力してください"
 
 #: src/gui/serverdialog.cpp:560
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #: src/gui/serverdialog.cpp:565
 msgid "Waiting for server..."
-msgstr "サーバーを待っている..."
+msgstr "サーバーからの応答を待っています"
 
 #: src/gui/serverdialog.cpp:569
 msgid "Preparing download"
@@ -1741,16 +1738,16 @@ msgstr "ダウンロード準備中..."
 
 #: src/gui/serverdialog.cpp:573
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "サーバーリストの読み込みに失敗"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
-msgstr ""
+msgstr "アップデートが必要です"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
-msgstr "要る v%s"
+msgstr "v%sが必要"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable Audio"
@@ -1770,11 +1767,11 @@ msgstr "音楽を有効にする"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "Mumble Voice Chatを有効にする"
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr "音楽ダウンロード"
+msgstr "音楽をダウンロードする"
 
 #: src/gui/setup_audio.cpp:61
 msgid "Audio"
@@ -1795,8 +1792,7 @@ msgstr "お知らせ"
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"新しい音楽をダウンロードする場合は、クライアントを再起動する必要がある可能性"
-"がある"
+"新しい音楽をダウンロードする場合はクライアントを再起動する必要があります"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -1804,39 +1800,39 @@ msgstr "サウンドエンジン"
 
 #: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
 msgid "Colors"
-msgstr "色彩"
+msgstr "色"
 
 #: src/gui/setup_chat.cpp:57
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "受信したメッセージの色を無効にする"
 
 #: src/gui/setup_chat.cpp:60
 msgid "Show chat colors list"
-msgstr ""
+msgstr "チャットの文字色リストを表示"
 
 #: src/gui/setup_chat.cpp:64
 msgid "Commands"
-msgstr ""
+msgstr "コマンド"
 
 #: src/gui/setup_chat.cpp:66
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "全てのタブで呪文とGMコマンドをログする"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "制限"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "チャットで一行に表示する最大文字数を制限する"
 
 #: src/gui/setup_chat.cpp:75
 msgid "Limit max lines in chat"
-msgstr ""
+msgstr "チャットで表示する最大行数を制限する"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "ログ"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1844,35 +1840,35 @@ msgstr "チャットログを有効"
 
 #: src/gui/setup_chat.cpp:84
 msgid "Show chat history"
-msgstr ""
+msgstr "チャット履歴を表示"
 
 #: src/gui/setup_chat.cpp:88
 msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
 
 #: src/gui/setup_chat.cpp:90
 msgid "Hide shop messages"
-msgstr ""
+msgstr "売買メッセージを隠す"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "タブ"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
-msgstr "プライベートメッセージをタブに出す。"
+msgstr "ささやきををタブで表示する"
 
 #: src/gui/setup_chat.cpp:99
 msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "デバッグタブに呪文をログする"
 
 #: src/gui/setup_chat.cpp:102
 msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "サーバーメッセージをデバッグタブにログする"
 
 #: src/gui/setup_chat.cpp:105
 msgid "Enable trade tab"
-msgstr ""
+msgstr "トレードタブを有効"
 
 #: src/gui/setup_chat.cpp:108
 msgid "Enable battle tab"
@@ -1880,39 +1876,39 @@ msgstr "バトルタブを有効"
 
 #: src/gui/setup_chat.cpp:111
 msgid "Show battle events"
-msgstr ""
+msgstr "バトルイベントを表示"
 
 #: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr ""
+msgstr "チャットタブをリサイズする"
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
-msgstr ""
+msgstr "時間"
 
 #: src/gui/setup_chat.cpp:120
 msgid "Use local time"
-msgstr ""
+msgstr "ローカルタイムを使う"
 
 #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Highlight words (separated by comma)"
-msgstr ""
+msgstr "文字をハイライト (コンマで区切る)"
 
 #: src/gui/setup_chat.cpp:128
 msgid "Show MVP messages"
-msgstr ""
+msgstr "MVPメッセージを表示する"
 
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
-msgstr "これがその色がどのように見えるかです。"
+msgstr "色の例"
 
 #: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr "タイプ："
+msgstr "タイプ:"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
@@ -1926,7 +1922,7 @@ msgstr "点滅"
 #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
 #: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
-msgstr "カラフル"
+msgstr "虹"
 
 #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
 #: src/gui/setup_colors.cpp:409
@@ -1935,23 +1931,23 @@ msgstr "スペクトル"
 
 #: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr "遅延："
+msgstr "遅延:"
 
 #: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr "赤"
+msgstr "赤:"
 
 #: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr "緑"
+msgstr "緑:"
 
 #: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr "青"
+msgstr "青:"
 
 #: src/gui/setup_colors.cpp:314
 msgid "Alpha:"
-msgstr "アルファ："
+msgstr "アルファ:"
 
 #: src/gui/setup.cpp:71
 msgid "Apply"
@@ -1963,11 +1959,11 @@ msgstr "ウィンドウをリセットする"
 
 #: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
 msgid "Press the button to start calibration"
-msgstr "ボタンを押すと較正が始まります。"
+msgstr "ボタンを押してカリブレーションを開始"
 
 #: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
 msgid "Calibrate"
-msgstr "変化させる"
+msgstr "カリブレーション"
 
 #: src/gui/setup_joystick.cpp:72
 msgid "Enable joystick"
@@ -1975,7 +1971,7 @@ msgstr "ジョイスティックを使用可能にする"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "クライアントが無効の場合ジョイスティックを使用"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -1987,7 +1983,7 @@ msgstr "停止"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "スティックで円を描きボタンは押さない"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2007,11 +2003,11 @@ msgstr "標準に戻す"
 
 #: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
-msgstr "キーが重複しています。"
+msgstr "ショートカットキーが重複しています"
 
 #: src/gui/setup_other.cpp:39
 msgid "Misc"
-msgstr "他"
+msgstr "その他"
 
 #: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
 msgid "Monsters"
@@ -2019,87 +2015,87 @@ msgstr "モンスター"
 
 #: src/gui/setup_other.cpp:47
 msgid "Show damage inflicted to monsters"
-msgstr "モンスターに与えた損傷を表示する"
+msgstr "モンスターに与えたダメージを表示する"
 
 #: src/gui/setup_other.cpp:50
 msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "攻撃可能範囲のモンスターのみ"
 
 #: src/gui/setup_other.cpp:53
 msgid "Highlight monster attack range"
-msgstr ""
+msgstr "モンスターの攻撃範囲を強調表示"
 
 #: src/gui/setup_other.cpp:57
 msgid "Show monster hp bar"
-msgstr "モンスターHPバーを表示する"
+msgstr "モンスターのHPバーを表示する"
 
 #: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr ""
+msgstr "選択したモンスターを円で表示"
 
 #: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
-msgstr ""
+msgstr "ワープパーティクルを表示"
 
 #: src/gui/setup_other.cpp:69
 msgid "Highlight map portals"
-msgstr ""
+msgstr "マップポータルを強調表示"
 
 #: src/gui/setup_other.cpp:72
 msgid "Highlight floor items"
-msgstr ""
+msgstr "床に落ちているアイテムを強調表示"
 
 #: src/gui/setup_other.cpp:75
 msgid "Highlight player attack range"
-msgstr ""
+msgstr "攻撃可能範囲を強調表示"
 
 #: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "拡張ミニマップを表示する"
 
 #: src/gui/setup_other.cpp:81
 msgid "Draw path"
-msgstr "パスを描画"
+msgstr "パスを表示させる"
 
 #: src/gui/setup_other.cpp:84
 msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "マップにホットキーを表示させる"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr ""
+msgstr "レイジースクロールを有効にする"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr ""
+msgstr "レイジースクロール"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
-msgstr ""
+msgstr "ラディアススクロール"
 
 #: src/gui/setup_other.cpp:97
 msgid "Moving"
-msgstr ""
+msgstr "動作"
 
 #: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
-msgstr ""
+msgstr "自動で位置を修正"
 
 #: src/gui/setup_other.cpp:102
 msgid "Attack while moving"
-msgstr ""
+msgstr "移動中も攻撃する"
 
 #: src/gui/setup_other.cpp:105
 msgid "Sync player move"
-msgstr ""
+msgstr "プレイヤーの動きを同化する"
 
 #: src/gui/setup_other.cpp:108
 msgid "Crazy move A program"
-msgstr ""
+msgstr "クレイジームーブ A プログラム"
 
 #: src/gui/setup_other.cpp:112
 msgid "Player"
-msgstr ""
+msgstr "プレイヤー"
 
 #: src/gui/setup_other.cpp:114
 msgid "Show own hp bar"
@@ -2107,83 +2103,83 @@ msgstr "自分のHPバーを表示する"
 
 #: src/gui/setup_other.cpp:117
 msgid "Enable quick stats"
-msgstr ""
+msgstr "クイックスタッツを有効にする"
 
 #: src/gui/setup_other.cpp:120
 msgid "Cycle player targets"
-msgstr ""
+msgstr "選択したプレイヤーを円で表示"
 
 #: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
-msgstr ""
+msgstr "ジョブExpメッセージを表示する"
 
 #: src/gui/setup_other.cpp:126
 msgid "Show players popups"
-msgstr ""
+msgstr "プレイヤーポップアップを表示する"
 
 #: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr ""
+msgstr "AFKメッセージ"
 
 #: src/gui/setup_other.cpp:132
 msgid "Show job"
-msgstr "仕事を表示する"
+msgstr "ジョブを表示する"
 
 #: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
-msgstr ""
+msgstr "攻撃フィルターを有効にする"
 
 #: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
-msgstr ""
+msgstr "アドバートプロトコルを有効にする"
 
 #: src/gui/setup_other.cpp:144
 msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "売買リクエストを受け入れる"
 
 #: src/gui/setup_other.cpp:147
 msgid "Enable shop mode"
-msgstr ""
+msgstr "ショップモードを有効にする"
 
 #: src/gui/setup_other.cpp:153
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "NPCダイアログを記録する"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
-msgstr ""
+msgstr "ボットサポート"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr ""
+msgstr "オークションボットのサポート"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
+msgstr "ギルドサポートを無効にしギルドボットを有効にする"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
-msgstr ""
+msgstr "サーバーサイドアタックを有効にする"
 
 #: src/gui/setup_other.cpp:171
 msgid "Enable bot checker"
-msgstr ""
+msgstr "ボットチェッカーを有効にする"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "不安定なサーバー保護を有効にする(無効にしない)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
-msgstr "デバッグループを有効にする"
+msgstr "デバッグログを有効にする"
 
 #: src/gui/setup_other.cpp:181
 msgid "Low traffic mode"
-msgstr ""
+msgstr "低トラフィックモード"
 
 #: src/gui/setup_other.cpp:184
 msgid "Hide shield sprite"
-msgstr ""
+msgstr "シールドスプライトを隠す"
 
 #: src/gui/setup_other.cpp:187
 msgid "Show background"
@@ -2192,54 +2188,57 @@ msgstr "背景を表示する"
 #: src/gui/setup_perfomance.cpp:55
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
+"より良いパフォーマンス (より良いパフォーマンスの為には有効にして下さい)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "パフォーマンスを自動調整"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Hw acceleration"
-msgstr ""
+msgstr "ハードウェアアクセラレーション"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
+"透過キャッシュを有効化する (ソフトウェア-メモリを沢山使用する可能性がありま"
+"す)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "マップ削減を有効化 (ソフトウェア)"
 
 #: src/gui/setup_perfomance.cpp:70
 msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "より良いクオリティ (より良いパフォーマンスの為には無効にして下さい)"
 
 #: src/gui/setup_perfomance.cpp:73
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "アルファチャンネル修正を有効化 (ソフトウェア-重くなる可能性があります)"
 
 #: src/gui/setup_perfomance.cpp:77
 msgid "Show beings transparency"
-msgstr ""
+msgstr "透過を表示する"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
-msgstr ""
+msgstr "スプライトリオーダーを有効にする."
 
 #: src/gui/setup_perfomance.cpp:83
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "メモリ優先 (メモリ使用を少なくするには有効にして下さい)"
 
 #: src/gui/setup_perfomance.cpp:86
 msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "アドバンスキャッシュを無効にする (ソフトウェア)"
 
 #: src/gui/setup_perfomance.cpp:89
 msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "キャッシュを無効にする (ソフトウェア)"
 
 #: src/gui/setup_players.cpp:54
 msgid "Show gender"
-msgstr "性的を表示する"
+msgstr "性別を表示する"
 
 #: src/gui/setup_players.cpp:57
 msgid "Show level"
@@ -2251,11 +2250,11 @@ msgstr "自分の名前を表示する"
 
 #: src/gui/setup_players.cpp:63
 msgid "Enable extended mouse targeting"
-msgstr ""
+msgstr "エクステンドマウスターゲットを有効にする"
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
-msgstr ""
+msgstr "死んだプレイヤーの標的を有効"
 
 #: src/gui/setup_players.cpp:69
 msgid "Visible names"
@@ -2263,23 +2262,23 @@ msgstr "名前を表示する"
 
 #: src/gui/setup_players.cpp:72
 msgid "Secure trades"
-msgstr ""
+msgstr "トレードを安全化する"
 
 #: src/gui/setup_players.cpp:75
 msgid "Unsecure chars in names"
-msgstr ""
+msgstr "セキュリティ上安全ではない文字が含まれています"
 
 #: src/gui/setup_players.cpp:78
 msgid "Show statuses"
-msgstr ""
+msgstr "ステータスを表示する"
 
 #: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "スクリーンショットにIPを表示させる"
 
 #: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
-msgstr ""
+msgstr "クリックでヒール"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2303,23 +2302,23 @@ msgstr "無視する"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
-msgstr "消した"
+msgstr "削除済"
 
 #: src/gui/setup_relations.cpp:75
 msgid "Blacklisted"
-msgstr ""
+msgstr "ブラックリスト化されています"
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "敵"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
-msgstr "交換を承認する"
+msgstr "トレードを受付ける"
 
 #: src/gui/setup_relations.cpp:242
 msgid "Allow whispers"
-msgstr "プライベートメッセージを受け取ることを承認する"
+msgstr "全てのささやきを受け取る"
 
 #: src/gui/setup_relations.cpp:245
 msgid "Old"
@@ -2327,11 +2326,11 @@ msgstr "古い"
 
 #: src/gui/setup_relations.cpp:247
 msgid "Relations"
-msgstr ""
+msgstr "関係"
 
 #: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
-msgstr "無視の際には："
+msgstr "無視の際には:"
 
 #: src/gui/setup_theme.cpp:108
 msgid "Tiny (10)"
@@ -2339,79 +2338,79 @@ msgstr "小さい (10)"
 
 #: src/gui/setup_theme.cpp:109
 msgid "Small (11)"
-msgstr "小（11）"
+msgstr "小 (11)"
 
 #: src/gui/setup_theme.cpp:110
 msgid "Medium (12)"
-msgstr "媒体（12）"
+msgstr "中 (12)"
 
 #: src/gui/setup_theme.cpp:111
 msgid "Large (13)"
-msgstr "大（13）"
+msgstr "大1 (13)"
 
 #: src/gui/setup_theme.cpp:112
 msgid "Big (14)"
-msgstr "ビッグ（14）"
+msgstr "大2 (14)"
 
 #: src/gui/setup_theme.cpp:113
 msgid "Huge (15)"
-msgstr "巨大（15）"
+msgstr "最大 (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "中国語 (中国)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "チェコ語"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "英語"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "フィンランド語"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "フランス語"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "ドイツ語"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "インドネシア語"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "ポーランド語"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "日本語"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "ドイツ語 (ベルギー/フランドル)"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
-msgstr ""
+msgstr "ポルトガル語"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "ポルトガル語 (ブラジル)"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Russian"
-msgstr ""
+msgstr "ロシア語"
 
 #: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "スペイン語 (カスティリヤ)"
 
 #: src/gui/setup_theme.cpp:191
 msgid "Theme"
@@ -2423,7 +2422,7 @@ msgstr "GUIテーマ"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "言語"
 
 #: src/gui/setup_theme.cpp:195
 msgid "Main Font"
@@ -2435,7 +2434,7 @@ msgstr "太字フォント"
 
 #: src/gui/setup_theme.cpp:197
 msgid "Particle font"
-msgstr "粒子のフォント"
+msgstr "パーティクルフォント"
 
 #: src/gui/setup_theme.cpp:198
 msgid "Help font"
@@ -2443,11 +2442,11 @@ msgstr "ヘルプフォント"
 
 #: src/gui/setup_theme.cpp:199
 msgid "Secure font"
-msgstr ""
+msgstr "安全なフォント"
 
 #: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
-msgstr ""
+msgstr "日本語フォント"
 
 #: src/gui/setup_theme.cpp:237
 msgid "Font size"
@@ -2455,16 +2454,16 @@ msgstr "フォントサイズ"
 
 #: src/gui/setup_theme.cpp:378
 msgid "Theme Changed"
-msgstr "テーマは変えました"
+msgstr "テーマを変更しました"
 
 #: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
 #: src/gui/setup_video.cpp:624
 msgid "Restart your client for the change to take effect."
-msgstr "設定変更のため、アプリケーションを再起動してください。"
+msgstr "設定変更の為アプリケーションを再起動してください"
 
 #: src/gui/setup_video.cpp:194
 msgid "Software"
-msgstr "ソフトウェア"
+msgstr "マップポータルを強調表示"
 
 #: src/gui/setup_video.cpp:195
 msgid "Fast OpenGL"
@@ -2484,11 +2483,11 @@ msgstr "テキスト"
 
 #: src/gui/setup_video.cpp:227
 msgid "Bubbles, no names"
-msgstr "バブル、名前表示なし"
+msgstr "吹き出し,名前表示なし"
 
 #: src/gui/setup_video.cpp:229
 msgid "Bubbles with names"
-msgstr "バブル、名前表示あり"
+msgstr "吹き出し,名前表示あり"
 
 #: src/gui/setup_video.cpp:242
 msgid "off"
@@ -2520,16 +2519,16 @@ msgstr "カスタムカーソル"
 
 #: src/gui/setup_video.cpp:291
 msgid "Particle effects"
-msgstr "粒子効果"
+msgstr "パーティクル効果"
 
 #: src/gui/setup_video.cpp:293
 msgid "Show pickup notification"
-msgstr "ピックアップ通知表示"
+msgstr "収集通知表示"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:295
 msgid "in chat"
-msgstr "チャット中"
+msgstr "チャットで"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:297
@@ -2538,12 +2537,12 @@ msgstr "画面内で"
 
 #: src/gui/setup_video.cpp:302
 msgid "FPS limit:"
-msgstr "FPSリミット"
+msgstr "FPSリミット:"
 
 #: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
 #: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
 msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Alt FPS リミット: "
 
 #: src/gui/setup_video.cpp:321
 msgid "Overhead text"
@@ -2559,7 +2558,7 @@ msgstr "環境FX"
 
 #: src/gui/setup_video.cpp:324
 msgid "Particle detail"
-msgstr "粒子の詳細"
+msgstr "パーティクルの詳細"
 
 #: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
 #: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
@@ -2570,12 +2569,12 @@ msgstr "なし"
 #: src/gui/setup_video.cpp:484
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "ウインドウモードでも前のモードの復元もまた失敗しました！"
+msgstr "ウインドウモード、また前モードの復元にも失敗しました"
 
 #: src/gui/setup_video.cpp:490
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "フルスクリーンモードでも前のモードの復元もまた失敗しました！"
+msgstr "フルスクリーンモード、また前モードの復元にも失敗しました"
 
 #: src/gui/setup_video.cpp:501
 msgid "Switching to Full Screen"
@@ -2583,7 +2582,7 @@ msgstr "フルスクリーンに変更"
 
 #: src/gui/setup_video.cpp:502
 msgid "Restart needed for changes to take effect."
-msgstr "設定変更のため、再起動をしてください。"
+msgstr "設定変更の為、再起動をしてください"
 
 #: src/gui/setup_video.cpp:514
 msgid "Changing to OpenGL"
@@ -2595,39 +2594,39 @@ msgstr "OpenGLの設定を変更するため、再起動をしてください。
 
 #: src/gui/setup_video.cpp:602
 msgid "Custom resolution (example: 1024x768)"
-msgstr "カスタム解像度（例：1024 × 768）"
+msgstr "カスタム解像度 (例: 1024x768)"
 
 #: src/gui/setup_video.cpp:603
 msgid "Enter new resolution:                "
-msgstr ""
+msgstr "解像度を入力して下さい:                "
 
 #: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
 msgid "Screen Resolution Changed"
-msgstr "スクリーンの解像度が変わりました。"
+msgstr "スクリーンの解像度を変更しました"
 
 #: src/gui/setup_video.cpp:621
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
 
 #: src/gui/setup_video.cpp:654
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "パーティクル効果の設定を変更しました"
 
 #: src/gui/setup_video.cpp:655
 msgid "Changes will take effect on map change."
-msgstr "変化はマップがかわったときから影響します。"
+msgstr "変更はマップが変わった時に有効になります"
 
 #: src/gui/shopwindow.cpp:75
 msgid "Personal Shop"
-msgstr "パーサナルショップ"
+msgstr "最大 (15)"
 
 #: src/gui/shopwindow.cpp:118
 msgid "Buy items"
-msgstr "商品を買う"
+msgstr "購入"
 
 #: src/gui/shopwindow.cpp:119
 msgid "Sell items"
-msgstr "商品を売る"
+msgstr "販売"
 
 #: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
 #: src/gui/tradewindow.cpp:89
@@ -2636,25 +2635,25 @@ msgstr "追加"
 
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
 msgid "Announce"
-msgstr "発表する"
+msgstr "アナウンス"
 
 #: src/gui/shopwindow.cpp:127
 msgid "Show links in announce"
-msgstr ""
+msgstr "アナウンスにリンクを表示する"
 
 #: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
 msgid "Auction"
-msgstr ""
+msgstr "オークション"
 
 #: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
-msgstr "取引要求"
+msgstr "トレードをリクエスト"
 
 #: src/gui/shopwindow.cpp:749
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%sが%s %sを希望しています。承認しますか？"
 
 #: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2662,7 +2661,7 @@ msgstr "スキル"
 
 #: src/gui/skilldialog.cpp:288
 msgid "Up"
-msgstr "上げる"
+msgstr "上"
 
 #: src/gui/skilldialog.cpp:341
 #, c-format
@@ -2687,202 +2686,212 @@ msgstr "Lvl: %d"
 #: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Lvl：%d (%+d)"
+msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "ギルド"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "ユーザー %sを、ギルド %sに招待しました"
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "ギルド %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "ギルドへメンバーを招待しました"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "ギルド %sに誰を招待しますか？"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
-msgstr "ギルドを残す？"
+msgstr "ギルドから退会しますか？"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "ギルド %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "パーティー"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "ユーザー %s をパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "パーティ %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "メンバーをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "パーティ %sに誰を招待しますか?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
-msgstr "パーティーを残す？"
+msgstr "パーティーから退会しますか？"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "パーティ %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
-msgstr "航法"
+msgstr "ナビ"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
-msgstr ""
+msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
-msgstr ""
+msgstr "優先される敵"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
-msgstr ""
+msgstr "敵を攻撃する"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
-msgstr ""
+msgstr "敵を無視する"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
-msgstr "ソシアル"
+msgstr "ソーシャル"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "招待"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "%sからのパーティ招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "%sからのパーティ招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "%sからのギルド招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "%sからのギルド招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "ギルド %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "パーティ %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "ギルド名"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
-msgstr "サーバーを選んでください。"
+msgstr "ギルド名を選んでください"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "ギルド招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%sがギルド %sへ招待しています"
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
-msgstr "ギルド招待を受け入れ"
+msgstr "ギルド招待を受け入れる"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
-msgstr "パーティへの招待を受け取りましたが、もう既に存在しています。"
+msgstr "パーティ招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "パーティに招待されました"
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "パーティ %sに招待されました"
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
-msgstr "%sはあなたをパーティに招待しました。"
+msgstr "%sはあなたをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
-msgstr "%sはあなたを%sというパーティに招待しました。"
+msgstr "%sはあなたを%sというパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
-msgstr "パーティ招待を受け入れます。"
+msgstr "パーティ招待を受け入れます"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
-msgstr "パーティーを作成することはできません。もうパーティーに入っています。"
+msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "パーティ名"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
-msgstr "スペシアール"
+msgstr "スペシャル"
 
 #: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
 #: src/gui/statuswindow.cpp:337
@@ -2894,7 +2903,7 @@ msgstr "レベル: %d"
 #: src/gui/statuswindow.cpp:304
 #, c-format
 msgid "Money: %s"
-msgstr "GP:%s"
+msgstr "GP: %s"
 
 #: src/gui/statuswindow.cpp:151
 msgid "HP:"
@@ -2920,17 +2929,17 @@ msgstr "ジョブポイント:"
 #: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
 #, c-format
 msgid "Character points: %d"
-msgstr "キャラクターポイント： %d"
+msgstr "キャラクターポイント: %d"
 
 #: src/gui/statuswindow.cpp:269
 #, c-format
 msgid "Level: %d (GM %d)"
-msgstr "レベル： %d (GM %d)"
+msgstr "レベル: %d (GM %d)"
 
 #: src/gui/statuswindow.cpp:325
 #, c-format
 msgid "Correction points: %d"
-msgstr "修正点： %d"
+msgstr "修正点: %d"
 
 #: src/gui/textcommandeditor.cpp:113
 msgid "No Target"
@@ -2938,7 +2947,7 @@ msgstr "ターゲットなし"
 
 #: src/gui/textcommandeditor.cpp:114
 msgid "Allow Target"
-msgstr "ターゲットを許可する"
+msgstr "ターゲットを有効にする"
 
 #: src/gui/textcommandeditor.cpp:115
 msgid "Need Target"
@@ -2950,19 +2959,19 @@ msgstr "ジェネラル魔法"
 
 #: src/gui/textcommandeditor.cpp:121
 msgid "Life Magic"
-msgstr "命魔法"
+msgstr "ライフ魔法"
 
 #: src/gui/textcommandeditor.cpp:122
 msgid "War Magic"
-msgstr "戦争魔法"
+msgstr "ウォー魔法"
 
 #: src/gui/textcommandeditor.cpp:123
 msgid "Transmute Magic"
-msgstr "変わる魔法"
+msgstr "トランスミュート魔法"
 
 #: src/gui/textcommandeditor.cpp:124
 msgid "Nature Magic"
-msgstr "自然魔法"
+msgstr "ネイチャー魔法"
 
 #: src/gui/textcommandeditor.cpp:125
 msgid "Astral Magic"
@@ -2982,39 +2991,39 @@ msgstr "他"
 
 #: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
-msgstr "シンボル："
+msgstr "シンボル:"
 
 #: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
-msgstr "コマンド："
+msgstr "コマンド:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
-msgstr ""
+msgstr "コメント:"
 
 #: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
-msgstr "マナ："
+msgstr "マナ:"
 
 #: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
-msgstr "ターゲットタイプ："
+msgstr "ターゲットタイプ:"
 
 #: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
-msgstr "アイコン"
+msgstr "アイコン:"
 
 #: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
-msgstr "魔法レベル："
+msgstr "魔法レベル:"
 
 #: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
-msgstr "魔法学園"
+msgstr "魔法学園:"
 
 #: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
-msgstr "学校レベル："
+msgstr "学校レベル:"
 
 #: src/gui/textcommandeditor.cpp:238
 msgid "Save"
@@ -3022,23 +3031,23 @@ msgstr "セーブ"
 
 #: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
-msgstr "交換の提案"
+msgstr "トレードを申請する"
 
 #: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
-msgstr "確認しました。待っています…。"
+msgstr "確認中"
 
 #: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
-msgstr "交換を了承する"
+msgstr "トレードを了承する"
 
 #: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
-msgstr "了承しました。待っています…。"
+msgstr "了承しました"
 
 #: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
-msgstr "交換:あなたと"
+msgstr "交換:自分"
 
 #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
@@ -3047,7 +3056,7 @@ msgstr "%sを手に入れた"
 
 #: src/gui/tradewindow.cpp:112
 msgid "You give:"
-msgstr "あげる物:"
+msgstr "トレードするアイテム:"
 
 #: src/gui/tradewindow.cpp:116
 msgid "Change"
@@ -3055,46 +3064,46 @@ msgstr "変更"
 
 #: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
-msgstr "現金不足です。"
+msgstr "現金不足です"
 
 #: src/gui/tradewindow.cpp:454
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
-"複して追加することは出来ません！"
+"アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
+"加することは出来ません"
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "更新しています..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
-msgstr "##1  アップデートは完了していません。"
+msgstr "##1  アップデートは完了していません"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
-msgstr "##1 とても推奨されます。"
+msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
-msgstr ""
+msgstr "##1  しばらくたってからもう一度試してください"
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "完了"
 
@@ -3108,15 +3117,15 @@ msgstr "友達の名前"
 
 #: src/gui/userpalette.cpp:118
 msgid "Disregarded Names"
-msgstr "無視名前"
+msgstr "無視している名前"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr "無視された名前"
+msgstr "無視している名前"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
-msgstr "消去名前"
+msgstr "削除した名前"
 
 #: src/gui/userpalette.cpp:121
 msgid "Other Players' Names"
@@ -3128,11 +3137,11 @@ msgstr "自分の名前"
 
 #: src/gui/userpalette.cpp:123
 msgid "GM Names"
-msgstr "ゲームマスター名"
+msgstr "GM名"
 
 #: src/gui/userpalette.cpp:124
 msgid "NPCs"
-msgstr "NPCたち"
+msgstr "NPC"
 
 #: src/gui/userpalette.cpp:126
 msgid "Monster HP bar"
@@ -3144,7 +3153,7 @@ msgstr "モンスターのHPバー（二番目の色）"
 
 #: src/gui/userpalette.cpp:129
 msgid "Party Members"
-msgstr "パティメンバー"
+msgstr "パーティメンバー"
 
 #: src/gui/userpalette.cpp:130
 msgid "Guild Members"
@@ -3180,7 +3189,7 @@ msgstr "モンスターはプレイヤーをヒット"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr ""
+msgstr "他のプレイヤーがローカルプレイヤーを攻撃しました"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3188,15 +3197,15 @@ msgstr "クリティカルヒット"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "ローカルプレイヤーがモンスターを攻撃しました"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "ローカルプレイヤー　会心の一撃"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
-msgstr ""
+msgstr "ローカルプレイヤー　ミス"
 
 #: src/gui/userpalette.cpp:148
 msgid "Misses"
@@ -3208,19 +3217,19 @@ msgstr "ポータルハイライト"
 
 #: src/gui/userpalette.cpp:151
 msgid "Default collision Highlight"
-msgstr ""
+msgstr "デフォルトコリジョンハイライト"
 
 #: src/gui/userpalette.cpp:153
 msgid "Air collision Highlight"
-msgstr ""
+msgstr "空コリジョンハイライト"
 
 #: src/gui/userpalette.cpp:155
 msgid "Water collision Highlight"
-msgstr ""
+msgstr "水コリジョンハイライト"
 
 #: src/gui/userpalette.cpp:157
 msgid "Walkable Highlight"
-msgstr "歩くハイライト"
+msgstr "歩道ハイライト"
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
@@ -3236,35 +3245,35 @@ msgstr "モンスター攻撃範囲"
 
 #: src/gui/userpalette.cpp:165
 msgid "Home Place"
-msgstr "ホーム場所"
+msgstr "ホーム位置"
 
 #: src/gui/userpalette.cpp:167
 msgid "Home Place Border"
-msgstr ""
+msgstr "ホームボーダー"
 
 #: src/gui/userpalette.cpp:169
 msgid "Road Point"
-msgstr "ロードのポイント"
+msgstr "ロードポイント"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
-msgstr ""
+msgstr "オンラインリスト - アップデート中"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
-msgstr ""
+msgstr "オンラインリスト - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
-msgstr ""
+msgstr "オンラインリスト - エラー"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
-msgstr ""
+msgstr "オンラインリスト - アップデート"
 
 #: src/gui/widgets/battletab.cpp:45
 msgid "Battle"
@@ -3296,7 +3305,7 @@ msgstr "コマンド: /users"
 
 #: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
-msgstr "このコマンドはチャンネル内のユーザーを表示します。"
+msgstr "このコマンドはチャンネルに参加中のユーザーを表示します"
 
 #: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
@@ -3304,7 +3313,7 @@ msgstr "コマンド: /topic <メッセージ>"
 
 #: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
-msgstr "このコマンドでは、トピックを設定します。"
+msgstr "このコマンドはトピックを設定します"
 
 #: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
@@ -3312,53 +3321,53 @@ msgstr "コマンド: /quit"
 
 #: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
-msgstr "このコマンドでは、現在いるチャンネルを去ります。"
+msgstr "このコマンドは現在いるチャンネルを去ります"
 
 #: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
-msgstr "もしそのチャンネルの最後の人ならば、そのチャンネルは削除されます。"
+msgstr "チャンネルにユーザーがいない場合は削除されます"
 
 #: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
-msgstr "コマンド: /op <ニックネーム>"
+msgstr "コマンド: /op <プレイヤー名>"
 
 #: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
-msgstr "このコマンドでは、入力したユーザーをチャンネルのオペレータとなる"
+msgstr "このコマンドは入力したユーザーをチャンネルのオペレータに指定します"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
 #: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 #: src/net/ea/gui/partytab.cpp:85
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
-"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
-"囲んでください。"
+"入力するニックネームにスペースが含まれている場合はダブルコーテーション(\"\")"
+"で囲んでください"
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "チャンネルのオペレーターはチャンネルからオペレーター以外のユーザーを追い出す"
-"ことができます。"
+"ことができます"
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
-msgstr "コマンド: /kick <ニックネーム>"
+msgstr "コマンド: /kick <プレイヤー名>"
 
 #: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
-msgstr "このコマンドでは、ユーザをチャンネルから追い出すことができます。"
+msgstr "このコマンドはユーザをチャンネルから追い出します"
 
 #: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
-msgstr "オペレーターになる人が必要です！"
+msgstr "オペレーターになる人が必要です"
 
 #: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
-msgstr "追い出すことができるメンバーが必要です！"
+msgstr "追い出すメンバーが必要です"
 
 #: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
-msgstr "アナウンス:"
+msgstr "グローバルアナウンス:"
 
 #: src/gui/widgets/chattab.cpp:157
 #, c-format
@@ -3373,11 +3382,11 @@ msgstr "%s ささやく: %s"
 #: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
 #: src/net/ea/gui/partytab.cpp:83
 msgid "Command: /invite <nick>"
-msgstr "コマンド: /invite ＜プレイヤー名＞"
+msgstr "コマンド: /invite <プレイヤー名>"
 
 #: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
 msgid "This command invites <nick> to the guild you're in."
-msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
+msgstr "このコマンドは、入力したプレイヤーを自分のギルドに招待します"
 
 #: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
 #: src/net/ea/gui/partytab.cpp:90
@@ -3386,28 +3395,28 @@ msgstr "コマンド: /leave"
 
 #: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
 msgid "This command causes the player to leave the guild."
-msgstr ""
+msgstr "このコマンドはプレイヤーをギルドから退会させます"
 
 #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
 #: src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr "/helpでこのヘルプを表示する。"
+msgstr "/help > ヘルプメニューを表示"
 
 #: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr ""
+msgstr "/invite > プレイヤーをギルドへ招待する"
 
 #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr ""
+msgstr "/leave > ギルドから退会する"
 
 #: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
+msgstr "/kick > プレイヤーをギルドから追い出します"
 
 #: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
 msgid "Edit"
-msgstr "エディット"
+msgstr "編集"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3415,11 +3424,11 @@ msgstr "/ignore > 他のプレイヤーを無視する"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore はプレイヤー無視を解除をします"
 
 #: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
-msgstr "/closeでプライベートメッセージのタブを閉じます。"
+msgstr "/closeでささやきタブを閉じます"
 
 #: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
@@ -3427,28 +3436,27 @@ msgstr "コマンド: /close"
 
 #: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
-msgstr ""
-"このコマンドでは、現在開いているプライベートメッセージのタブを閉じます。"
+msgstr "このコマンドは現在開いているささやきタブを閉じます"
 
 #: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "コマンド： /ignore"
+msgstr "コマンド: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr ""
+msgstr "このコマンドは全てのプレイヤーを無視します"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
-msgstr "コマンド：　/unignore <プレイヤー>"
+msgstr "コマンド: /unignore <プレイヤー名>"
 
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
+msgstr "このコマンドはプレイヤー無視を解除します"
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
-msgstr "ボット"
+msgstr "BC"
 
 #: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
@@ -3456,51 +3464,51 @@ msgstr "ボットチェッカー"
 
 #: src/gui/windowmenu.cpp:67
 msgid "ONL"
-msgstr ""
+msgstr "ONL"
 
 #: src/gui/windowmenu.cpp:67
 msgid "Who is online"
-msgstr "誰がオンライン"
+msgstr "オンラインリスト"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
-msgstr ""
+msgstr "KS"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
-msgstr ""
+msgstr "スマイリー"
 
 #: src/gui/windowmenu.cpp:73
 msgid "STA"
-msgstr ""
+msgstr "STA"
 
 #: src/gui/windowmenu.cpp:73
 msgid "Status"
-msgstr "状態"
+msgstr "ステータス"
 
 #: src/gui/windowmenu.cpp:74
 msgid "EQU"
-msgstr ""
+msgstr "EQU"
 
 #: src/gui/windowmenu.cpp:76
 msgid "INV"
-msgstr ""
+msgstr "INV"
 
 #: src/gui/windowmenu.cpp:81
 msgid "SKI"
-msgstr ""
+msgstr "SKI"
 
 #: src/gui/windowmenu.cpp:88
 msgid "SPE"
-msgstr ""
+msgstr "SPE"
 
 #: src/gui/windowmenu.cpp:93
 msgid "SOC"
-msgstr ""
+msgstr "SOC"
 
 #: src/gui/windowmenu.cpp:94
 msgid "SH"
-msgstr ""
+msgstr "SH"
 
 #: src/gui/windowmenu.cpp:94
 msgid "Shortcuts"
@@ -3508,23 +3516,23 @@ msgstr "ショートカット"
 
 #: src/gui/windowmenu.cpp:96
 msgid "SP"
-msgstr ""
+msgstr "SP"
 
 #: src/gui/windowmenu.cpp:97
 msgid "DR"
-msgstr ""
+msgstr "DR"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "YK"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "豆知識"
 
 #: src/gui/windowmenu.cpp:100
 msgid "SET"
-msgstr ""
+msgstr "SET"
 
 #: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
@@ -3536,59 +3544,59 @@ msgstr "ログインの変更"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
-msgstr "世界を選ぶ"
+msgstr "世界の選択"
 
 #: src/inventory.cpp:251
 msgid "Storage"
-msgstr "保存"
+msgstr "倉庫"
 
 #: src/inventory.cpp:253
 msgid "Cart"
-msgstr "荷馬車"
+msgstr "カート"
 
 #: src/keyboardconfig.cpp:43
 msgid "Basic Keys"
-msgstr ""
+msgstr "標準キー"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Up"
-msgstr "上移動"
+msgstr "上へ移動"
 
 #: src/keyboardconfig.cpp:45
 msgid "Move Down"
-msgstr "下移動"
+msgstr "下へ移動"
 
 #: src/keyboardconfig.cpp:46
 msgid "Move Left"
-msgstr "左移動"
+msgstr "左へ移動"
 
 #: src/keyboardconfig.cpp:47
 msgid "Move Right"
-msgstr "右移動"
+msgstr "右へ移動"
 
 #: src/keyboardconfig.cpp:50
 msgid "Target & Attack"
-msgstr "ターゲットと攻撃"
+msgstr "ターゲット&攻撃"
 
 #: src/keyboardconfig.cpp:52
 msgid "Move to Target"
-msgstr "ターゲットに動く"
+msgstr "ターゲットまで移動"
 
 #: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "ターゲットへ接近方法変更"
 
 #: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
-msgstr "ホーム場所に動く"
+msgstr "ホーム位置まで移動"
 
 #: src/keyboardconfig.cpp:58
 msgid "Set home location"
-msgstr ""
+msgstr "ホーム位置変更"
 
 #: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
-msgstr ""
+msgstr "ナビゲーションポイントへ移動"
 
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
@@ -3596,7 +3604,7 @@ msgstr "攻撃を止める"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
-msgstr ""
+msgstr "ターゲットから外す"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
@@ -3608,7 +3616,7 @@ msgstr "NPCを狙う"
 
 #: src/keyboardconfig.cpp:69
 msgid "Target Player"
-msgstr "プレイヤーを狙う"
+msgstr "プレイヤーをターゲット"
 
 #: src/keyboardconfig.cpp:71
 msgid "Pickup"
@@ -3616,7 +3624,7 @@ msgstr "拾う"
 
 #: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
-msgstr ""
+msgstr "拾い方を変更"
 
 #: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
@@ -3632,11 +3640,11 @@ msgstr "スクリーンショット"
 
 #: src/keyboardconfig.cpp:78
 msgid "Enable/Disable Trading"
-msgstr "取引を可能/不可能にする"
+msgstr "取引を有効/無効にする"
 
 #: src/keyboardconfig.cpp:80
 msgid "Change Map View Mode"
-msgstr ""
+msgstr "マップビューモード変更"
 
 #: src/keyboardconfig.cpp:82
 msgid "Select OK"
@@ -3644,11 +3652,11 @@ msgstr "OKを選択する"
 
 #: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr ""
+msgstr "ショートカットキー"
 
 #: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
-msgstr ""
+msgstr "アイテムショートカットキー"
 
 #: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
@@ -3667,7 +3675,7 @@ msgstr "アイテムショートカット: %d"
 
 #: src/keyboardconfig.cpp:128
 msgid "Windows Keys"
-msgstr ""
+msgstr "ウィンドウズキー"
 
 #: src/keyboardconfig.cpp:129
 msgid "Help Window"
@@ -3675,15 +3683,15 @@ msgstr "ヘルプウィンドウ"
 
 #: src/keyboardconfig.cpp:131
 msgid "Status Window"
-msgstr "ステータス・ウィンドウ"
+msgstr "ステータスウィンドウ"
 
 #: src/keyboardconfig.cpp:133
 msgid "Inventory Window"
-msgstr "在庫ウィンドウ"
+msgstr "インベントリーウィンドウ"
 
 #: src/keyboardconfig.cpp:135
 msgid "Equipment Window"
-msgstr "装備ウィンドウ"
+msgstr "装着ウィンドウ"
 
 #: src/keyboardconfig.cpp:137
 msgid "Skill Window"
@@ -3691,7 +3699,7 @@ msgstr "スキルウィンドウ"
 
 #: src/keyboardconfig.cpp:139
 msgid "Minimap Window"
-msgstr "小さなマップウィンドウ"
+msgstr "ミニマップウィンドウ"
 
 #: src/keyboardconfig.cpp:141
 msgid "Chat Window"
@@ -3711,15 +3719,15 @@ msgstr "デバグウィンドウ"
 
 #: src/keyboardconfig.cpp:149
 msgid "Social Window"
-msgstr "ソシアルウインドウ"
+msgstr "ソーシャルウインドウ"
 
 #: src/keyboardconfig.cpp:151
 msgid "Emote Shortcut Window"
-msgstr "表情ショートカットウィンドウ"
+msgstr "スマイリーショートカットウィンドウ"
 
 #: src/keyboardconfig.cpp:153
 msgid "Outfits Window"
-msgstr "服ウインドウ"
+msgstr "服装ウインドウ"
 
 #: src/keyboardconfig.cpp:155
 msgid "Shop Window"
@@ -3731,7 +3739,7 @@ msgstr "クイックドロップウィンドウ"
 
 #: src/keyboardconfig.cpp:159
 msgid "Kill Stats Window"
-msgstr ""
+msgstr "キルスタッツ窓"
 
 #: src/keyboardconfig.cpp:161
 msgid "Commands Window"
@@ -3739,27 +3747,27 @@ msgstr "コマンドウインドウ"
 
 #: src/keyboardconfig.cpp:163
 msgid "Bot Checker Window"
-msgstr ""
+msgstr "ボットチェッカーウィンドウ"
 
 #: src/keyboardconfig.cpp:166
 msgid "Who Is Online Window"
-msgstr "オンライン・ウザー・ウインドウ"
+msgstr "オンラインユーザーウインドウ"
 
 #: src/keyboardconfig.cpp:168
 msgid "Did you know Window"
-msgstr ""
+msgstr "豆知識窓"
 
 #: src/keyboardconfig.cpp:171
 msgid "Previous Social Tab"
-msgstr ""
+msgstr "前ソーシャルタブ"
 
 #: src/keyboardconfig.cpp:173
 msgid "Next Social Tab"
-msgstr ""
+msgstr "次ソーシャルタブ"
 
 #: src/keyboardconfig.cpp:175
 msgid "Emotes Keys"
-msgstr ""
+msgstr "スマイリーキー"
 
 #: src/keyboardconfig.cpp:176
 msgid "Smilie"
@@ -3794,7 +3802,7 @@ msgstr "スマイリーショートカット: %d"
 
 #: src/keyboardconfig.cpp:270
 msgid "Outfits Keys"
-msgstr ""
+msgstr "服装キー"
 
 #: src/keyboardconfig.cpp:271
 msgid "Wear Outfit"
@@ -3806,11 +3814,11 @@ msgstr "服をコピーする"
 
 #: src/keyboardconfig.cpp:275
 msgid "Copy equipped to Outfit"
-msgstr ""
+msgstr "装着品を服装にコピー"
 
 #: src/keyboardconfig.cpp:277
 msgid "Chat Keys"
-msgstr ""
+msgstr "チャットキー"
 
 #: src/keyboardconfig.cpp:278
 msgid "Toggle Chat"
@@ -3818,11 +3826,11 @@ msgstr "トグルチャット"
 
 #: src/keyboardconfig.cpp:280
 msgid "Scroll Chat Up"
-msgstr "チャットを上にスクロールする"
+msgstr "チャットを上へスクロールする"
 
 #: src/keyboardconfig.cpp:282
 msgid "Scroll Chat Down"
-msgstr "チャットを下にスクロールする"
+msgstr "チャットを下へスクロールする"
 
 #: src/keyboardconfig.cpp:284
 msgid "Previous Chat Tab"
@@ -3834,27 +3842,27 @@ msgstr "次のチャットタブ"
 
 #: src/keyboardconfig.cpp:289
 msgid "Close current Chat Tab"
-msgstr ""
+msgstr "このチャットタブを閉じる"
 
 #: src/keyboardconfig.cpp:291
 msgid "Previous chat line"
-msgstr ""
+msgstr "前チャット文"
 
 #: src/keyboardconfig.cpp:293
 msgid "Next chat line"
-msgstr ""
+msgstr "次チャット文"
 
 #: src/keyboardconfig.cpp:295
 msgid "Chat Auto Complete"
-msgstr ""
+msgstr "チャットオートコンプリート"
 
 #: src/keyboardconfig.cpp:297
 msgid "Deactivate Chat Input"
-msgstr ""
+msgstr "チャット入力無効"
 
 #: src/keyboardconfig.cpp:299
 msgid "Other Keys"
-msgstr ""
+msgstr "その他のキー"
 
 #: src/keyboardconfig.cpp:300
 msgid "Ignore input 1"
@@ -3866,47 +3874,47 @@ msgstr "インプット２無視"
 
 #: src/keyboardconfig.cpp:304
 msgid "Direct Up"
-msgstr "方向上"
+msgstr "上方向"
 
 #: src/keyboardconfig.cpp:305
 msgid "Direct Down"
-msgstr "方向下"
+msgstr "下方向"
 
 #: src/keyboardconfig.cpp:307
 msgid "Direct Left"
-msgstr "方向 左"
+msgstr "左方向"
 
 #: src/keyboardconfig.cpp:308
 msgid "Direct Right"
-msgstr "方向右"
+msgstr "右方向"
 
 #: src/keyboardconfig.cpp:310
 msgid "Crazy moves"
-msgstr "クレイジーに移動"
+msgstr "クレイジームーブ"
 
 #: src/keyboardconfig.cpp:312
 msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "クレイジームーブモード変更"
 
 #: src/keyboardconfig.cpp:314
 msgid "Quick Drop N Items from 0 slot"
-msgstr ""
+msgstr "Nアイテムを 0スロットからクイックドロップ"
 
 #: src/keyboardconfig.cpp:316
 msgid "Quick Drop N Items"
-msgstr ""
+msgstr "Nアイテムをクイックドロップ"
 
 #: src/keyboardconfig.cpp:318
 msgid "Switch Quick Drop Counter"
-msgstr ""
+msgstr "クイックドロップカウンター変更"
 
 #: src/keyboardconfig.cpp:320
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "ターゲット又は自分をHP回復させる"
 
 #: src/keyboardconfig.cpp:322
 msgid "Use #itenplz spell"
-msgstr "#itenplz は呪文を使う"
+msgstr "呪文 #itenplz を唱える"
 
 #: src/keyboardconfig.cpp:324
 msgid "Use magic attack"
@@ -3914,55 +3922,55 @@ msgstr "魔法攻撃を使用"
 
 #: src/keyboardconfig.cpp:326
 msgid "Switch magic attack"
-msgstr ""
+msgstr "マジックアタック変更"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "PvP攻撃変更"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
-msgstr ""
+msgstr "ムーブタイプ変更"
 
 #: src/keyboardconfig.cpp:332
 msgid "Change Attack Weapon Type"
-msgstr ""
+msgstr "武器変更"
 
 #: src/keyboardconfig.cpp:334
 msgid "Change Attack Type"
-msgstr ""
+msgstr "攻撃方法変更"
 
 #: src/keyboardconfig.cpp:336
 msgid "Change Follow mode"
-msgstr ""
+msgstr "フォローモード変更"
 
 #: src/keyboardconfig.cpp:338
 msgid "Change Imitation mode"
-msgstr ""
+msgstr "真似モード変更"
 
 #: src/keyboardconfig.cpp:341
 msgid "Disable / Enable Game modifier keys"
-msgstr ""
+msgstr "ゲームモディファイアキーを無効 / 有効にする"
 
 #: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
-msgstr "アウディオ　オン/オフ"
+msgstr "オーディオ　オン/オフ"
 
 #: src/keyboardconfig.cpp:344
 msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "AFKモードを有効 / 無効にする"
 
 #: src/keyboardconfig.cpp:346
 msgid "Emulate right click from keyboard"
-msgstr ""
+msgstr "右クリックをエミュレートする"
 
 #: src/keyboardconfig.cpp:348
 msgid "Toggle camera mode"
-msgstr ""
+msgstr "カメラモード変更"
 
 #: src/keyboardconfig.cpp:350
 msgid "Modifier key"
-msgstr ""
+msgstr "モディファイアーキー"
 
 #: src/keyboardconfig.cpp:429
 #, c-format
@@ -3970,562 +3978,577 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
+"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
+"ん。"
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr ""
+#, c-format
+msgid "You were killed by %s"
+msgstr "%sによって殺されました"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
-msgstr ""
+msgstr "存在しないアイテムは拾えません"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
-msgstr ""
+msgstr "アイテムが重過ぎます"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
-msgstr ""
+msgstr "アイテムが遠すぎます."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
-msgstr ""
+msgstr "インベントリーが満杯です"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
-msgstr ""
+msgstr "量が多すぎます"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "これは他のプレイヤーのアイテムです"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
-msgstr ""
+msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
+msgstr[0] "%d [@@%d|%s@@]を手に入れました"
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) クレイジームーブを含んだムーブ"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
-msgstr ""
+msgstr "(d) ダブルノーマル + クレイジー"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) 動く"
+msgstr "(?) 不明なムーブ"
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
-msgstr ""
+msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) ターゲットへデフォルト接近"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(1) 距離1でターゲットへ接近"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) 距離2でターゲットに近付く"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) 距離3でターゲットへ接近"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) 距離5でターゲットに近付く"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) 距離7でターゲットに近付く"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
-msgstr ""
+msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) ターゲットに近付く"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) 友達フォロー"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) 不明なフォロー"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
-msgstr "(?) 襲う"
+msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) 盾なし攻撃"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) 盾あり攻撃"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) 接近、攻撃"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) 接近、攻撃、拾う"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) 自動攻撃なし"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) 小範囲で拾う 1x1セル"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) 広範囲で拾う 2x3セル"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) 3x3セルの範囲で拾う"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) 距離4の範囲で拾う"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) 距離8で拾う"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) 最大範囲で拾う"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
-msgstr "(?) 拾い上げる"
+msgstr "(?) 拾う"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) デバッグマップビュー"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) 魔法攻撃は #flarを使う"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) 魔法攻撃は #chizaを使う"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) 魔法攻撃は #ingravを使う"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) 魔法攻撃は #frillyarを使う"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) 全てのプレイヤーを攻撃"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) 友達以外を攻撃"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) 他のプレイヤーを攻撃しない"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) 服装真似"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
-msgstr "(?) "
+msgstr "(?) 真似をする"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
-msgstr "去って"
+msgstr "アウェイ"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
-msgstr "(A) "
+msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
-msgstr "(?) 不在で"
+msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
-msgstr ""
+msgstr "ゲームモディファイアは有効になってます"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
-msgstr ""
+msgstr "ゲームモディファイアは無効になってます"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
-msgstr ""
+msgstr "不明なゲームモディファイアー"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
-msgstr "従う: "
+msgstr "フォロー: "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
-msgstr ""
+msgstr "フォローを止める"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
-msgstr "擬い: "
+msgstr "真似: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
-msgstr ""
+msgstr "真似をやめる"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
-msgstr "あなた"
+msgstr " が見える"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
-msgstr ""
+msgstr "manaplus [オプション] [manaplus-ファイル]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
+msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
-msgstr ""
+msgstr "                  でカスタムパラメーターを設定しました"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
-msgstr ""
+msgstr "                  をmanaplusクライアントへ設定しました"
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
-msgstr ""
+msgstr "  -l --log-file       : 使用するログファイル"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr ""
+msgstr "  -L --chat-log-dir   : チャットログ場所"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "  -v --version        : バージョンを表示"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
-msgstr ""
+msgstr "  -h --help           : ヘルプメニュー表示"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+msgstr "  -C --config-dir     : 使用する設定ファイル"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
-msgstr ""
+msgstr "  -U --username       : この名前でログインする"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
-msgstr ""
+msgstr "  -P --password       : このパスワードでログインする"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
-msgstr ""
+msgstr "  -c --character      : このキャラクターでログインする"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
+msgstr "  -s --server         : ログインサーバー又はIP"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
-msgstr ""
+msgstr "  -p --port           : ログインサーバーポート"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
-msgstr ""
+msgstr "     --update-host    : このアップデートホストを利用する"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
+"  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
+"ターを選択する"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+msgstr "  -u --skip-update    : アップデートをスキップする"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+msgstr "  -d --data           : ゲームデータを読み込む場所"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+msgstr "  -L --localdata-dir  : ローカルデータディレクトリの場所"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr "     --screenshot-dir : スクリーンショットの保存場所"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
+msgstr "     --safemode       : セーフモードでゲームを始める"
+
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
+"  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
 
-#: src/main.cpp:75
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "     --openglエラー      : OpenGLを今回のみ無効にする"
 
 #: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
-msgstr "売り物がございません。"
+msgstr "売るアイテムがありません"
 
 #: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
-msgstr "買ってくださり、ありがとうございました。"
+msgstr "ご購入ありがとうございました"
 
 #: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
-msgstr "購買不可能"
+msgstr "購買できません"
 
 #: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
-msgstr "筋力:"
+msgstr "Strength:"
 
 #: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
-msgstr "素早さ:"
+msgstr "Agility:"
 
 #: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
-msgstr "体力:"
+msgstr "Vitality:"
 
 #: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
-msgstr "知性:"
+msgstr "Intelligence:"
 
 #: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
-msgstr "敏捷:"
+msgstr "Dexterity:"
 
 #: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
-msgstr "運:"
+msgstr "Luck:"
 
 #: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "アクセスできません。サーバーが混みあっています"
 
 #: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
-msgstr "ID使用不可能。"
+msgstr "このIDは使用できません"
 
 #: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
-msgstr ""
+msgstr "不明なキャラクターサーバーエラー"
 
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "キャラクター作成失敗。本名はのう使われている。"
+msgstr ""
+"キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
+"れています"
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
-msgstr "名前間違い"
+msgstr "名前が違います"
 
 #: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
-msgstr "不適切な統計。"
+msgstr "間違った統計"
 
 #: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
-msgstr "不適切な髪。"
+msgstr "間違った髪型"
 
 #: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
-msgstr "不適切なスロット。"
+msgstr "間違ったスロット"
+
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "種別が間違っています"
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "情報"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
-msgstr "キャラクターを削除した。"
+msgstr "キャラクターを削除しました"
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
-msgstr "キャラ削除失敗"
+msgstr "キャラクター削除に失敗しました"
 
 #: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
 #: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
 #: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
 #: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
-msgstr "チャンネルはサポートされていない。"
+msgstr "チャンネルはサポートされていません"
 
 #: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "%sがオフラインの為ささやきは送れませんでした"
 
 #: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
+msgstr "%sが無視設定をしている為ささやきは送れませんでした"
 
 #: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
-msgstr "プレイヤー MVP"
+msgstr "MVPプレイヤー"
 
 #: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
-msgstr "プレイヤー MVP "
+msgstr "MVPプレイヤー: "
 
 #: src/net/ea/chathandler.cpp:370
 msgid "All whispers ignored."
-msgstr ""
+msgstr "全てのささやきを無視しました"
 
 #: src/net/ea/chathandler.cpp:374
 msgid "All whispers ignore failed."
-msgstr ""
+msgstr "全てのささやきの無視に失敗しました"
 
 #: src/net/ea/chathandler.cpp:385
 msgid "All whispers unignored."
-msgstr ""
+msgstr "全てのささやきを無視解除しました"
 
 #: src/net/ea/chathandler.cpp:389
 msgid "All whispers unignore failed."
-msgstr ""
+msgstr "全てのささやきの無視解除に失敗しました"
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
-msgstr "オンラインユーザー：%d"
+msgstr "オンラインユーザー: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "ゲーム"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
-msgstr ""
+msgstr "今キャンセルできません"
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
@@ -4533,138 +4556,138 @@ msgstr "ギルド作成成功"
 
 #: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
 msgid "You are already in guild."
-msgstr ""
+msgstr "既にギルドへ入会しています"
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
-msgstr ""
+msgstr "認証エラー"
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr "不明なサーバーの応答。"
+msgstr "サーバーから不明な応答です"
 
 #: src/net/ea/guildhandler.cpp:180
 #, c-format
 msgid "Guild name: %s"
-msgstr "ギルド名：%s"
+msgstr "ギルド名: %s"
 
 #: src/net/ea/guildhandler.cpp:182
 #, c-format
 msgid "Guild master: %s"
-msgstr "ギルドマスタ： %s"
+msgstr "ギルドマスター: %s"
 
 #: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
-msgstr "ギルドレベル：%d"
+msgstr "ギルドレベル: %d"
 
 #: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
-msgstr "オンラインウザー： %d"
+msgstr "オンラインユーザー: %d"
 
 #: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
-msgstr "最大のメンバー： %d"
+msgstr "最大メンバー数: %d"
 
 #: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
-msgstr "平均レベル： %d"
+msgstr "平均レベル: %d"
 
 #: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
-msgstr "ギルド経験：%d"
+msgstr "ギルドExp: %d"
 
 #: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "次のギルドExpまで: %d"
 
 #: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
-msgstr "ギルド城：%s"
+msgstr "ギルド城: %s"
 
 #: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "ユーザーをギルドへ招待できませんでした"
 
 #: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "ユーザーはギルド招待を断りました"
 
 #: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "ユーザーはギルドへ入会しました"
 
 #: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
-msgstr ""
+msgstr "ギルドが定員になりました"
 
 #: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
-msgstr ""
+msgstr "ギルド招待に対して不明な返答"
 
 #: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
-msgstr ""
+msgstr "%sがギルドを退会しました"
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr ""
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "ギルドから追い出されました"
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr ""
+msgstr "%sがギルドから追い出しました"
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
-msgstr "/inviteでパーティにプレーヤーを招待する。"
+msgstr "/invite パーティにプレイヤーを招待する"
 
 #: src/net/ea/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
-msgstr "/leaveで既存のパーティから離れる。"
+msgstr "/leave パーティから退会する"
 
 #: src/net/ea/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
-msgstr "/kickで既存のパーティから一人を追い出してみる。"
+msgstr "/kick パーティからメンバーを一時的に追い出す"
 
 #: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr "/item でパーティ内のアイテムシェアモードを表示および変更する。"
+msgstr "/item パーティ内でアイテム共有モードを表示/変更する"
 
 #: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp でパーティ内の経験分割モードを表示および変更する。"
+msgstr "/exp でパーティ内の経験シェアモードを表示/変更する"
 
 #: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr "このコマンドでは、入力したプレイヤーを自分のパーティーに招待します。"
+msgstr "このコマンドは入力したプレイヤーを自分のパーティーに招待します"
 
 #: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr "本コマンドではパティからプレイヤーを追い出させる。"
+msgstr "このコマンドはパーティからプレイヤーを退会させます"
 
 #: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr "コマンド: /item <ポリシ>"
+msgstr "コマンド: /item <ポリシー>"
 
 #: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr "本コマンドでは、アイテム共有モードを変更する。"
+msgstr "このコマンドはアイテム共有モードを変更します"
 
 #: src/net/ea/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"＜ポリシ＞を有効するためには「１」、「yes」か「true」を設定ください。無効にす"
-"るために、「0」、「no」か「false」を設定ください。"
+"＜ポリシー＞ アイテム共有モードを有効するためには \"1\", \"yes\", \"true\"、"
+"無効にするには\"0\", \"no\", \"false\"と入力して下さい"
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4672,23 +4695,23 @@ msgstr "コマンド: /item"
 
 #: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "本コマンドでは、アイテム共有モードを表示する。"
+msgstr "このコマンドはアイテム共有モードを表示します"
 
 #: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr "コマンド: /exp <ポリシ>"
+msgstr "コマンド: /exp <ポリシー>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "本コマンドでは、経験分割モードを変更する。"
+msgstr "このコマンドは経験シェアモードを変更します"
 
 #: src/net/ea/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<ポリシ>を有効するためには、「1」、「yes」か「true」を設定ください。無効にす"
-"る場合、「0」、「no」か「false」を設定ください。"
+"＜ポリシー＞ 経験シェアモードを有効するためには \"1\", \"yes\", \"true\"、無"
+"効にするには\"0\", \"no\", \"false\"と入力して下さい"
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4696,112 +4719,112 @@ msgstr "コマンド: /exp"
 
 #: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr "本コマンドでは、パーティメンバー以内の経験分割方針を表示する。"
+msgstr "このコマンドはパーティメンバーの経験シェアモードを表示します"
 
 #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
-msgstr "アイテムシェア有効"
+msgstr "アイテム共有モード有効"
 
 #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
-msgstr "アイテムシェア無効"
+msgstr "アイテム共有モード無効"
 
 #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
-msgstr "アイテムシェア不可能"
+msgstr "アイテム共有モード不可能"
 
 #: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr "アイテムシェア不明"
+msgstr "アイテム共有モード不明"
 
 #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
-msgstr "経験シェア有効"
+msgstr "経験シェアモード有効"
 
 #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
-msgstr "経験シェア無効"
+msgstr "経験シェアモード無効"
 
 #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
-msgstr "経験シェア不可能"
+msgstr "経験シェアモード不可能"
 
 #: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr "経験シェア不明"
+msgstr "経験シェアモード不明"
 
 #: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
-msgstr "アイテム使用失敗"
+msgstr "アイテム使用に失敗"
 
 #: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
-msgstr "装備不可能"
+msgstr "装着不可能"
 
 #: src/net/ea/loginhandler.cpp:131
 msgid "Account was not found. Please re-login."
-msgstr "アカウントが見つからなかった。再ログインをください。"
+msgstr "アカウントが見つかりませんでした。再度ログインして下さい"
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr ""
+msgstr "変更前のパスワードが間違っています"
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
-msgstr "新パスワードは短い過ぎます。"
+msgstr "新しいパスワードは文字数が足りません"
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
-msgstr "不明エラー"
+msgstr "不明なエラー"
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
-msgstr "未登録なID。"
+msgstr "未登録なID"
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
-msgstr "入力したパスワードは間違っています。"
+msgstr "入力したパスワードは間違っています"
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
-msgstr "アカウントの有効期限が切られた。"
+msgstr "アカウントの有効期限が切れました"
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
-msgstr ""
+msgstr "サーバーから拒否されました"
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい"
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
-msgstr ""
+msgstr "アップデートが必要です"
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"あなたは%sまでゲームからバーンされた。\n"
-"ゲームマスターたちにご連絡ください。"
+"あなたは%sまでゲームから追放されました。\n"
+"GMにご連絡下さい。"
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
-msgstr ""
+msgstr "サーバーが混雑しています"
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
-msgstr "ユーザ名はもう使われている。"
+msgstr "ユーザ名は既に使用されています"
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
-msgstr ""
+msgstr "ユーザーネームは永久に削除されました"
 
 #: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
@@ -4809,89 +4832,88 @@ msgstr "パーティ作成失敗"
 
 #: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
-msgstr "パーティ作成成功"
+msgstr "パーティを作成しました"
 
 #: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%sがパーティに参加しました"
 
 #: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
-msgstr "%sはもうパーティのメンバーである。"
+msgstr "%sは既にパーティのメンバーです"
 
 #: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
-msgstr "%sは招待を拒んだ。"
+msgstr "%sは招待を拒否しました"
 
 #: src/net/ea/partyhandler.cpp:184
 #, c-format
 msgid "%s is now a member of your party."
-msgstr "%sは今からパーティのメンバーになった。"
+msgstr "%sはパーティのメンバーになりました"
 
 #: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "パーティが満員の為%sは参加できません"
 
 #: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr ""
+msgstr "QQQ %sから不明な返答"
 
 #: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
-msgstr "パーティから離れた。"
+msgstr "パーティから退会しました"
 
 #: src/net/ea/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
-msgstr "%sがパーティから離れた。"
+msgstr "%sがパーティから退会しました"
 
 #: src/net/ea/partyhandler.cpp:448
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr "不明なメンバーが言おうとした事: %s"
+msgstr "不明なメンバーからの応答: %s"
 
 #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
-msgstr "あなたは死にました。"
+msgstr "あなたは死にました"
 
 #: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
-msgstr "残念なお知らせですが、あなた様のキャラは戦闘中亡くなってしまいました。"
+msgstr "残念なお知らせですが、あなた様のキャラは戦闘中にお亡くなりになりました"
 
 #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
-msgstr "今から生きていない。"
+msgstr "既に死んでいる模様です"
 
 #: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "死神の冷たい手に魂が取られてしまった。"
+msgstr "死神の冷たい手に魂が取られてしまった"
 
 #: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
-msgstr "ゲームオーバー!"
+msgstr "ゲームオーバー"
 
 #: src/net/ea/playerhandler.cpp:102
 msgid "Insert coin to continue."
-msgstr "ゲームを続けるためにはコインを入れてください。"
+msgstr "ゲームを続けるためにはコインを入れてください"
 
 #: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
-"ううん、棒ややち。あなたのキャラは本当にしんでなかった。もっと綺麗なところに"
-"向かっただけ。"
+"あなたのキャラは本当は死んではいません。もっと素敵なところに向かっただけ"
 
 #: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
-msgstr "喉で的の武器を潰す予定だったが…失敗した。"
+msgstr "敵の武器を潰す予定だったが…失敗した"
 
 #: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
@@ -4899,80 +4921,78 @@ msgstr "あんまり上手くいかなかったぜー"
 
 #: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
-msgstr "持ち物を確定して欲しい？"
+msgstr "遺体の持ち物を確定して欲しい？"
 
 #: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
-msgstr "悲しさのあまり、痕跡でさえ見つからなかった。"
+msgstr "悲しいですがあなたの跡形さえも残っていません"
 
 #: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
-msgstr "全滅された。"
+msgstr "全滅しちゃった"
 
 #: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
-msgstr "相手から自分の頭が渡されたみたい。"
+msgstr "敵から「忘れ物」って自分の頭を渡されました"
 
 #: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr "もう一回倒された、水道管から死体を這ってみた後、新体を受け取ってみて"
+msgstr "またやっちゃったね。死体をドブに捨てたら新しいのもらえるかも"
 
 #: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
-msgstr "まだ死ななかった。休憩中だけである。"
+msgstr "まだ死んでいません。一時休憩中です"
 
 #: src/net/ea/playerhandler.cpp:121
 msgid "You are no more."
-msgstr "あなたはもう存在していない。"
+msgstr "あなたは無になった"
 
 #: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
-msgstr "生きることなく、いなくなった。"
+msgstr "存在を消し去った"
 
 #: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
-msgstr "あなたは息を引き取り、あなたを作った人へ逢いに行ってしまった。"
+msgstr "あなたは息を引き取り、神の元へ旅立った"
 
 #: src/net/ea/playerhandler.cpp:124
 msgid "You're a stiff."
-msgstr "あなたは死体である。"
+msgstr "あなたは死体になった"
 
 #: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
-msgstr "命を失い、天国に向かった。"
+msgstr "命を失い天国に向かった"
 
 #: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-"もしあなたがそんなにも生気に満ちていなかったならば、死んで葬られていたんじゃ"
-"ないか？"
+msgstr "そんなにも生気に満ちていなければ既に葬られていたはず"
 
 #: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
-msgstr "あなたのがんばりは今や歴史となったらしい。"
+msgstr "あなたのがんばりは今や歴史となった"
 
 #: src/net/ea/playerhandler.cpp:128
 msgid "You're off the twig."
-msgstr "クタバッタみたいな。"
+msgstr "死んじゃった"
 
 #: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
-msgstr "人間界から追い出された。"
+msgstr "やっちゃった"
 
 #: src/net/ea/playerhandler.cpp:130
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr "最後の呼吸だった。死神に会った後、無と結合しちゃった。"
+msgstr "最後の呼吸だった。死神に会った後、無と結合した"
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
-msgstr "旧プレイヤーである。"
+msgstr "存在しないプレイヤーです"
 
 #: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
-msgstr "お前の魂は北極まで飛ばれた。"
+msgstr "お前の魂は北極まで飛ばれた"
 
 #: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
 #: src/net/ea/playerhandler.cpp:427
@@ -4982,33 +5002,33 @@ msgstr "メッセージ"
 #: src/net/ea/playerhandler.cpp:336
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
-msgstr "持っているアイテムは体重より半分以上なので、体力が回復できない。"
+msgstr "インベントリーが体重の半分以上の為、体力は回復できません"
 
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
+msgstr "インベントリーが体重の半分以下になった為、体力は回復します"
 
 #: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "%sを手に入れました"
 
 #: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
-msgstr "あなたは %s を費やし"
+msgstr "%sを使いました"
 
 #: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
-msgstr "スキルはもう上がらない！"
+msgstr "スキルはこれ以上あがりません"
 
 #: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
-msgstr "矢を先に装備してください。"
+msgstr "矢を装着して下さい"
 
 #: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
-msgstr "取引失敗"
+msgstr "トレード失敗"
 
 #: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
@@ -5016,7 +5036,7 @@ msgstr "スマイリー表示失敗"
 
 #: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
-msgstr "触ることが失敗した。"
+msgstr "座れません"
 
 #: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
@@ -5024,110 +5044,110 @@ msgstr "チャット作成失敗"
 
 #: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
-msgstr "パーティに参加できなかった！"
+msgstr "パーティに参加できませんでした"
 
 #: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
-msgstr "叫べない！"
+msgstr "叫べません"
 
 #: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
-msgstr "あなたはまだ十分に高いlvlを達していない！"
+msgstr "あなたはまだ十分なlvlに達していません"
 
 #: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
-msgstr "HP不足！"
+msgstr "HP不足"
 
 #: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr "SP不足！"
+msgstr "SP不足"
 
 #: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
-msgstr "メモなし！"
+msgstr "メモがありません"
 
 #: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
-msgstr "今この行動は無理。"
+msgstr "今この行動はできません"
 
 #: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
-msgstr "金欠みたいんじゃないか…"
+msgstr "お金が足りません"
 
 #: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
-msgstr "本スキルがこの武器と使えない。"
+msgstr "このスキルはこの武器と一緒に使えません"
 
 #: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
-msgstr "他の赤宝石が必要となった！"
+msgstr "Red Gemが必要です"
 
 #: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
-msgstr "他の青宝石が必要となった！"
+msgstr "Blue Gemが必要です"
 
 #: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
-msgstr "アイテムが持ちすぎている状態！"
+msgstr "アイテムを持ちすぎています"
 
 #: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
-msgstr "うん？何それ？"
+msgstr "え？何それ？"
 
 #: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
-msgstr "ワープが失敗した。"
+msgstr "ワープに失敗しました"
 
 #: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
-msgstr "何も盗めなかった…"
+msgstr "何も盗めませんでした"
 
 #: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
-msgstr "毒は不効果"
+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はあなたと取引したいみたいが、応じる？"
+msgstr "%sはあなたにトレードを申請しています"
 
 #: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "取引は不可能。取引の相手は遠すぎる。"
+msgstr "相手が遠すぎる為トレードは不可能です"
 
 #: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "取引は不可能。本キャラが存在していない。"
+msgstr "キャラクターが存在しない為トレードは不可能です"
 
 #: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
-msgstr "不明な理由で取引が中止された。"
+msgstr "不明な理由でトレードはキャンセルされました"
 
 #: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
-msgstr "あなたと%sとの取引"
+msgstr "あなたと%sとのトレード"
 
 #: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr "%sとの取引が中止された。"
+msgstr "%sとのトレードは中止されました"
 
 #: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
-msgstr "できなかった取引キャンセルパケット"
+msgstr "できなかったトレードキャンセルパケット"
 
 #: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "アイテム追加失敗。相手はアイテムを持ちすぎている状態である。"
+msgstr "アイテム追加失敗。相手のインベントリーの重量オーバーです"
 
 #: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "アイテム追加失敗。相手の空いているスロットはない。"
+msgstr "アイテム追加失敗。相手のインベントリーに空スロットがありません"
 
 #: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
+msgstr "アイテム追加失敗。このアイテムはトレードできません"
 
 #: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
@@ -5135,181 +5155,181 @@ msgstr "不明な理由でアイテム追加失敗"
 
 #: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
-msgstr "取引中止"
+msgstr "トレード中止"
 
 #: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
-msgstr "取引完了"
+msgstr "トレード完了"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
-msgstr "強さ"
+msgstr "Strength"
 
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr "強度 (str) %+.1f"
+msgstr "Strength %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
-msgstr "素早さ"
+msgstr "Agility"
 
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr "機敏さ (agi) %+.1f"
+msgstr "Agility %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
-msgstr "器用さ"
+msgstr "Dexterity"
 
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr "器用さ (dex) %+.1f"
+msgstr "Dexterity %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
-msgstr "活力"
+msgstr "Vitality"
 
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr "活気 (vit) %+.1f"
+msgstr "Vitality %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
-msgstr "知能"
+msgstr "Intelligence"
 
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr "知能 (int) %+.1f"
+msgstr "Intelligence %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
-msgstr "気力"
+msgstr "Willpower"
 
 #: src/net/manaserv/attributes.cpp:232
 #, c-format
 msgid "Willpower %+.1f"
-msgstr "意地 (wil) %+.1f"
+msgstr "Willpower %+.1f"
 
 #: src/net/manaserv/beinghandler.cpp:337
 msgid "Press OK to respawn."
-msgstr ""
+msgstr "蘇るにはOKを押して下さい"
 
 #: src/net/manaserv/beinghandler.cpp:338
 msgid "You Died"
-msgstr "死んでしまった。"
+msgstr "死んでしまった"
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
-msgstr ""
+msgstr "再度ログインして下さい"
 
 #: src/net/manaserv/charhandler.cpp:148
 msgid "No empty slot."
-msgstr ""
+msgstr "空スロットがありません"
 
 #: src/net/manaserv/charhandler.cpp:151
 msgid "Invalid name."
-msgstr "不当名前"
+msgstr "無効な名前"
 
 #: src/net/manaserv/charhandler.cpp:154
 msgid "Character's name already exists."
-msgstr "ユーザー名は既に存在している。"
+msgstr "既に使用されているキャラクター名です"
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
-msgstr "不当髪型"
+msgstr "髪型がダサいので失格"
 
 #: src/net/manaserv/charhandler.cpp:160
 msgid "Invalid hair color."
-msgstr ""
+msgstr "無効の髪色"
 
 #: src/net/manaserv/charhandler.cpp:163
 msgid "Invalid gender."
-msgstr "無効な性的。"
+msgstr "キャラの性別間違ってるんじゃない？"
 
 #: src/net/manaserv/charhandler.cpp:166
 msgid "Character's stats are too high."
-msgstr ""
+msgstr "キャラクターのステータスが高すぎます"
 
 #: src/net/manaserv/charhandler.cpp:169
 msgid "Character's stats are too low."
-msgstr ""
+msgstr "キャラクターのステータスが低すぎます"
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
 msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
+msgstr "1つまたは複数のスタッツが最大を超えています: (%u - %u)."
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
-msgstr "無効場所の号"
+msgstr "スロットナンバーが無効です"
 
 #: src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
-msgstr "プレイヤーは削除された。"
+msgstr "プレイヤーは削除されました"
 
 #: src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr ""
+msgstr "ターゲットが遠すぎます"
 
 #: src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
-msgstr "不明エラー (%d)。"
+msgstr "不明エラー (%d)"
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
-msgstr "全サーバは現在フールである。"
+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"
+msgstr "トピック: %s"
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
 msgid "Players in this channel:"
-msgstr ""
+msgstr "このチャンネルにいるプレイヤー:"
 
 #: src/net/manaserv/chathandler.cpp:208
 msgid "Error joining channel."
-msgstr ""
+msgstr "チャンネルに参加できませんでした"
 
 #: src/net/manaserv/chathandler.cpp:214
 msgid "Listing channels."
-msgstr ""
+msgstr "チャンネルを表示しています"
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
-msgstr ""
+msgstr "全てのチャンネルリスト"
 
 #: src/net/manaserv/chathandler.cpp:299
 #, c-format
 msgid "%s entered the channel."
-msgstr ""
+msgstr "%sがチャンネルに参加しました"
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%sがチャンネルから外出しました"
 
 #: src/net/manaserv/chathandler.cpp:320
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%sが%sに%sしました"
 
 #: src/net/manaserv/chathandler.cpp:331
 #, c-format
 msgid "%s has kicked %s."
-msgstr "%s は％を蹴った %s"
+msgstr "%sは%sを追い出しました"
 
 #: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr ""
+msgstr "不明なチャンネルイベント"
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
@@ -5321,7 +5341,7 @@ msgstr "招待送信成功"
 
 #: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
-msgstr "本メンバーが無事に昇進された。"
+msgstr "本メンバーが無事に昇進されました"
 
 #: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
@@ -5329,378 +5349,291 @@ msgstr "メンバー昇進失敗"
 
 #: src/net/manaserv/loginhandler.cpp:93
 msgid "Wrong magic_token."
-msgstr ""
+msgstr "間違ったマジックトークンです"
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
 msgid "Already logged in."
-msgstr "すでにログインしています。"
+msgstr "既にログインしています"
 
 #: src/net/manaserv/loginhandler.cpp:99
 msgid "Account banned."
-msgstr ""
+msgstr "アカウント停止されました"
 
 #: src/net/manaserv/loginhandler.cpp:124
 msgid "New password incorrect."
-msgstr ""
+msgstr "新しいパスワードが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
-msgstr "アカウントが接続されていない。最初にログインしてください。"
+msgstr "アカウントが接続されていません。最初にログインしてください"
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr ""
+msgstr "新しいメールアドレスが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr ""
+msgstr "変更前のメールアドレスが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr ""
+msgstr "新しいメールアドレスは既に使用されています"
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
-msgstr ""
+msgstr "クライアントからの登録はできません。サーバー管理者に連絡をして下さい"
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr ""
+msgstr "アップデートが必要です"
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr ""
+msgstr "ユーザーネームまたはパスワードが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
-msgstr "アカウントが禁止されて"
+msgstr "アカウントは追放されています"
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "時間が経ってから再度ログインして下さい"
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
-msgstr "ユーザ名、パスワードかメールアドが間違ってる。"
+msgstr "ユーザ名、パスワード、またはメールアドレスが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:318
 msgid "Username already exists."
-msgstr "ユーザー名は既に存在している。"
+msgstr "既に使用されているユーザー名です"
 
 #: src/net/manaserv/loginhandler.cpp:321
 msgid "Email address already exists."
-msgstr "メールアドレスが既に存在している。"
+msgstr "既に使用されているメールアドレスです"
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "キャプチャ画像の時間切れまたは答えが間違っています"
 
 #: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
-msgstr "パーティに参加した。"
+msgstr "パーティに参加しました"
 
 #: src/net/manaserv/partyhandler.cpp:108
 #, c-format
 msgid "%s joined the party."
-msgstr "%sがパーティに参加した。"
+msgstr "%sがパーティに参加しました"
 
 #: src/net/manaserv/partyhandler.cpp:126
 #, c-format
 msgid "%s rejected your invite."
-msgstr "%sは招待を断った。"
+msgstr "%sは招待を断りました"
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
-msgstr "取引要求を受け取り中"
+msgstr "トレード申請を受付中"
 
 #: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
-msgstr "取引要求を無視にしている。"
+msgstr "トレード申請を無効中"
 
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
 msgid "Trading with %s"
-msgstr "%sと取引中"
+msgstr "%sとトレードします"
 
 #: src/net/tmwa/adminhandler.cpp:70
 msgid "Kick failed!"
-msgstr "キック失敗"
+msgstr "追い出し失敗"
 
 #: src/net/tmwa/adminhandler.cpp:72
 msgid "Kick succeeded!"
-msgstr "キック成功"
+msgstr "追い出し成功"
 
 #: src/net/tmwa/buysellhandler.cpp:133
 msgid "Thanks for selling."
-msgstr "売ってくださり、ありがとうございました。"
+msgstr "販売ありがとうございました。"
 
 #: src/net/tmwa/buysellhandler.cpp:137
 msgid "Unable to sell."
-msgstr "売ること不可能"
+msgstr "販売できません"
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "トレード中は売買できません"
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "トレード中は売買できません"
 
 #: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
-msgstr "強さ %+d"
+msgstr "Strength %+d"
 
 #: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
-msgstr "俊敏さ%+d"
+msgstr "Agility %+d"
 
 #: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
-msgstr "活力 %+d"
+msgstr "Vitality %+d"
 
 #: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
-msgstr "知能 %+d"
+msgstr "Intelligence %+d"
 
 #: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
-msgstr "正確さ %+d"
+msgstr "Dexterity %+d"
 
 #: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
-msgstr "運 %+d"
+msgstr "Luck %+d"
 
 #: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
-msgstr "認証に失敗しました。"
+msgstr "認証に失敗しました"
 
 #: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
-msgstr ""
+msgstr "利用できるサーバーがありません"
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "他からのログインがありました"
 
 #: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
-msgstr ""
+msgstr "このアカウントは既にログイン中です"
 
 #: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
-msgstr ""
+msgstr "スピードハックが探知されました"
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
-msgstr "重複しログイン。"
+msgstr "重複ログイン"
 
 #: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
-msgstr ""
+msgstr "不明な接続エラーです"
 
 #: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
-msgstr "サーバーから切断された。"
+msgstr "サーバーから切断されました"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
-msgstr "運"
+msgstr "Luck"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
-msgstr "防御"
+msgstr "Defense"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
-msgstr "特攻撃"
+msgstr "M.Attack"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
-msgstr "特防御"
+msgstr "M.Defense"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
-msgstr "％ 精度"
+msgstr "% Accuracy"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
-msgstr "％ 回避"
+msgstr "% Evade"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
-msgstr "% 危機"
+msgstr "% Critical"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "攻撃遅延"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr " 徒歩遅延"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "攻撃距離"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
-msgstr ""
+msgstr "ダメージ/秒"
 
 #: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "ネットワークに空のアドレスが送信されました::connect()!"
 
 #: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
-msgstr "ホスト名を解決できません。"
+msgstr "ホスト名を解決できません"
 
 #: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
-msgstr ""
+msgstr "サーバーへの接続が切断されました "
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
 msgid "%s is not in your party!"
-msgstr "%sはパーティにはいない！"
+msgstr "%sはパーティのメンバーではありません"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "'...'を表示する"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
-msgstr "名前を瞬き"
+msgstr "名前を点灯させる"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
-msgstr "フローティング'...'バブル"
+msgstr "フローティング'...'吹出し"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
-msgstr "フローティングバブル"
+msgstr "吹出し"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "名前なし"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
-msgstr "攻撃 %+d"
+msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
-msgstr "防御 %+d"
+msgstr "Defense %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "不明なアイテム"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 51a4d78ff..91737f2b7 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
+"POT-Creation-Date: 2012-01-25 20:17+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"
@@ -40,273 +40,273 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -315,43 +315,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
@@ -428,16 +428,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Quit"
 msgstr ""
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr ""
 
@@ -474,14 +474,14 @@ msgstr ""
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr ""
 
@@ -513,7 +513,7 @@ msgid "The email address entries mismatch."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr ""
 
@@ -579,8 +579,8 @@ msgstr ""
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr ""
 
@@ -622,47 +622,47 @@ msgstr ""
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
@@ -736,12 +736,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -905,7 +905,7 @@ msgid "Did You Know?"
 msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr ""
@@ -933,8 +933,8 @@ msgstr ""
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr ""
 
@@ -976,26 +976,26 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr ""
 
@@ -1009,17 +1009,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1242,31 +1242,27 @@ msgstr ""
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1285,6 +1281,7 @@ msgid "Outfit: %d"
 msgstr ""
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1368,7 +1365,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr ""
 
@@ -1420,7 +1417,7 @@ msgid "Show Items"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr ""
 
@@ -1472,8 +1469,8 @@ msgstr ""
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr ""
 
@@ -1485,8 +1482,8 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr ""
 
@@ -1495,7 +1492,7 @@ msgid "Warp"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
+msgid "Clear outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
@@ -1534,7 +1531,7 @@ msgstr ""
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr ""
 
@@ -1547,105 +1544,105 @@ msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr ""
 
@@ -1742,11 +1739,11 @@ msgstr ""
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2686,194 +2683,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3063,33 +3070,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr ""
 
@@ -3241,23 +3248,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3962,424 +3969,429 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4435,7 +4447,7 @@ msgstr ""
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr ""
 
@@ -4451,15 +4463,19 @@ msgstr ""
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4504,16 +4520,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4603,11 +4619,11 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
@@ -4736,54 +4752,54 @@ msgstr ""
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr ""
 
@@ -5121,7 +5137,7 @@ msgstr ""
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -5130,7 +5146,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5139,7 +5155,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5148,7 +5164,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5157,7 +5173,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5489,50 +5505,50 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
@@ -5553,47 +5569,47 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index eeea65927..0d1cb855e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
-"manaplus/team/nl_BE/)\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
+"team/nl_BE/)\n"
 "Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,113 +42,113 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,160 +157,160 @@ msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "vriend"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "genegeerd"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutraal"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Speler succesvol verwijderd!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Aangemaakt:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -320,43 +320,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -391,7 +391,7 @@ msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -410,7 +410,7 @@ msgstr "Beweeg"
 msgid "Result"
 msgstr "Resultaat"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Reset"
 
@@ -433,16 +433,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -454,8 +454,8 @@ msgid "Quit"
 msgstr "Afsluiten"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Maximum"
 
@@ -479,14 +479,14 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -518,7 +518,7 @@ msgid "The email address entries mismatch."
 msgstr "De email adres ingaven zijn niet gelijk."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
@@ -584,8 +584,8 @@ msgstr "Haarstijl:"
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -627,47 +627,47 @@ msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 msgid "Account and Character Management"
 msgstr "Account en personage beheer"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Verwissel Login"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Registreren"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Wijzig Email"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Kies"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Niveau %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(leeg)"
 
@@ -741,12 +741,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -910,7 +910,7 @@ msgid "Did You Know?"
 msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Sluiten"
@@ -938,8 +938,8 @@ msgstr "Uitrusting"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Afdoen"
 
@@ -981,26 +981,26 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Splitsen"
 
@@ -1014,17 +1014,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1247,31 +1247,27 @@ msgstr ""
 msgid "Need"
 msgstr "Nood"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Wachten op server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Indienen"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Wissen"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Volgende"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Aan:"
@@ -1290,6 +1286,7 @@ msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Sleutel: %s"
@@ -1373,7 +1370,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -1425,7 +1422,7 @@ msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "ontkleed"
 
@@ -1477,8 +1474,8 @@ msgstr "Spelers"
 msgid "Pick up"
 msgstr "Raap op"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -1490,8 +1487,8 @@ msgstr "Plaats voorwerp op de kaart"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1500,8 +1497,8 @@ msgid "Warp"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Inladen oude kleren"
+msgid "Clear outfit"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1539,119 +1536,118 @@ msgstr "away aanzetten"
 msgid "Disable away"
 msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Verlaat"
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Kopieer naar chat"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Laden van oude voorwerpsnelkoppelingen"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Laden van oude neerleggingsnelkoppeling"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Verberg"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Toon"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(standaard)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -1748,11 +1744,11 @@ msgstr "Download voorbereiden"
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -2700,194 +2696,204 @@ msgstr "Niv: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niv: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wie zou u willen uitnodigen in guild %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Aanv"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Sociaal"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Nodig uit"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Guild Naam"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Groep Naam"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -3079,33 +3085,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3257,23 +3263,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -3987,425 +3993,429 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "U bent gedoodt door "
+#, c-format
+msgid "You were killed by %s"
+msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) onbekend volgen"
+msgstr ""
 
-#: src/localplayer.cpp:1918
-#, fuzzy, c-format
+#: src/localplayer.cpp:1925
+#, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(?) vreemde beweging"
+msgstr ""
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Opties:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log bestand te gebruiken"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Chat log bestand te gebruiken"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Toon de versie"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Toon deze help"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Login met deze gebruikersnaam"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Loging met dit wachtwoord"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Login met dit karakter"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Login servernaam of IP"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Login serverpoort"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Updateserver te gebruiken"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : update downloads overslaan"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Map om spelgegevens te laden"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Start spel in veilige modus"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Zet OpenGL af voor deze sessie"
 
@@ -4463,7 +4473,7 @@ msgstr "Onbekende char-server fout."
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
@@ -4479,15 +4489,19 @@ msgstr "Ongeldig haar."
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -4532,16 +4546,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Online gebruikers: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Spel"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
@@ -4631,11 +4645,11 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
@@ -4772,39 +4786,39 @@ msgstr "Oud wachtwoord is ongeldig."
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Client is te oud."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4813,15 +4827,15 @@ msgstr ""
 "Je bent tijdelijk geband van het spel tot %s.\n"
 "Neem aub contact op met het GM team via de forums."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd"
 
@@ -5169,7 +5183,7 @@ msgstr "Handel geannuleerd."
 msgid "Trade completed."
 msgstr "Handel voltooid."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Kracht"
 
@@ -5178,7 +5192,7 @@ msgstr "Kracht"
 msgid "Strength %+.1f"
 msgstr "Kracht %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Behendigheid"
 
@@ -5187,7 +5201,7 @@ msgstr "Behendigheid"
 msgid "Agility %+.1f"
 msgstr "Behendigheid %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Handigheid"
 
@@ -5196,7 +5210,7 @@ msgstr "Handigheid"
 msgid "Dexterity %+.1f"
 msgstr "Handigheid %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitaliteit"
 
@@ -5205,7 +5219,7 @@ msgstr "Vitaliteit"
 msgid "Vitality %+.1f"
 msgstr "Vitality %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligentie"
 
@@ -5538,50 +5552,50 @@ msgstr "Onbekende connectiefout."
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Geluk"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Verdediging"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "M.Aanval"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "M.Verdediging"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Aanvalsvertraging"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Wandelvertraging"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Aanvalsbereik"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
@@ -5602,143 +5616,47 @@ msgstr "Verbinding met server beëindigd. "
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Say '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Blink naam"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Zwevende '...' bel"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Zwevende bel"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "naamloos"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Aanval %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Verdediging %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "Leven %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Magie %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
-
-#~ msgid "(?) move"
-#~ msgstr "(?) beweeg"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) map tonen"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D) design camera modus"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/pl.po b/po/pl.po
index 3bad53db2..1f2ee4bdc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,14 +4,14 @@
 #
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <matwa@poczta.pl>, 2011.
+#   <matwa@poczta.pl>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-12-08 19:05+0000\n"
-"Last-Translator: derpella <matwa@poczta.pl>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
 "pl/)\n"
 "Language: pl\n"
@@ -43,113 +43,113 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Obraz"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "Skórki"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Logowanie"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,105 +157,105 @@ msgid ""
 msgstr ""
 "Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty."
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Brak nazwy gildii."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "znajomy"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "lekceważony"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutralny"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr "wróg"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Gracz usunięty z powodzeniem!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -263,7 +263,7 @@ msgstr[0] "%d tydzień"
 msgstr[1] "%d tygodni/e"
 msgstr[2] "%d tygodni/e"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -271,7 +271,7 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -279,7 +279,7 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godzin/y"
 msgstr[2] "%d godzin/y"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -287,7 +287,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minut/y"
 msgstr[2] "%d minut/y"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -295,27 +295,27 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekund/y"
 msgstr[2] "%d sekund/y"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "rozmiar cache czcionki"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Rozmiar cache:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Stworzono:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Usunięto:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
@@ -324,43 +324,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
-msgstr "Nie można załądować mapy"
+msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -395,7 +395,7 @@ msgstr "Nazwa"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atak"
 
@@ -414,7 +414,7 @@ msgstr "Podejdź"
 msgid "Result"
 msgstr "Rezultat"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -437,16 +437,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -458,8 +458,8 @@ msgid "Quit"
 msgstr "Wyjdź"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Maks."
 
@@ -483,14 +483,14 @@ msgstr "Sprzedaj"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -522,7 +522,7 @@ msgid "The email address entries mismatch."
 msgstr "Pola adresu e-mail się nie zgadzają."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Zmień hasło"
 
@@ -588,8 +588,8 @@ msgstr "Fryzura:"
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Utwórz"
 
@@ -631,47 +631,47 @@ msgstr "Czy jesteś pewny/a, że chcesz usunąć tę postać?"
 msgid "Account and Character Management"
 msgstr "Zarządzanie kontem i postaciami"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Przeloguj się"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Zmiana adresu e-mail"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Wybierz"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Poziom %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(puste)"
 
@@ -745,12 +745,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -784,7 +784,7 @@ msgstr "Cel"
 
 #: src/gui/debugwindow.cpp:74
 msgid "Net"
-msgstr "Siatka"
+msgstr "Sieć"
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:251
@@ -914,7 +914,7 @@ msgid "Did You Know?"
 msgstr "Cz wiesz że..."
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Zamknij"
@@ -942,8 +942,8 @@ msgstr "Ekwipunek"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Zdejmij"
 
@@ -985,26 +985,26 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Użyj"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Upuść..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Podziel"
 
@@ -1018,17 +1018,17 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upuść"
@@ -1253,31 +1253,27 @@ msgstr "pasek statusu"
 msgid "Need"
 msgstr "Potrzeba"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Oczekiwanie na serwer"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Przerwij"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Dalej"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Zatwierdź"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ">Dalej"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Do:"
@@ -1296,6 +1292,7 @@ msgid "Outfit: %d"
 msgstr "Strój: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
@@ -1379,7 +1376,7 @@ msgstr "Odignoruj"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -1431,7 +1428,7 @@ msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Rozbierz"
 
@@ -1483,8 +1480,8 @@ msgstr "Gracze"
 msgid "Pick up"
 msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
@@ -1496,8 +1493,8 @@ msgstr "Portal"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1506,8 +1503,8 @@ msgid "Warp"
 msgstr "Teleport"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Przywróć stare stroje"
+msgid "Clear outfit"
+msgstr "Usuń ubiór"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1523,11 +1520,11 @@ msgstr "Edytuj zaklęcie"
 
 #: src/gui/popupmenu.cpp:636
 msgid "Disable highlight"
-msgstr "Wyłącz podświetlenie"
+msgstr "Wyłącz alarm"
 
 #: src/gui/popupmenu.cpp:638
 msgid "Enable highlight"
-msgstr "Włącz podświetlenie"
+msgstr "Włącz alarm"
 
 #: src/gui/popupmenu.cpp:640
 msgid "Don't remove name"
@@ -1545,7 +1542,7 @@ msgstr "Włącz tryb AFK"
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Opuść"
 
@@ -1558,105 +1555,105 @@ msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nick:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Komentarz gracza            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Komentarz:                      "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Przechowaj 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Przechowaj połowę"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Przechowaj wszystko"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Odbierz 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Odbierz połowę"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Odbierz wszystko"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Przywróć stare skróty przedmiotów"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Przywróć stare skróty upuszczania"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Ukryj"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Pokaż"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(domyślne)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "W górę"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "W dół"
 
@@ -1753,11 +1750,11 @@ msgstr "Przygotowanie ściągania"
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -2702,194 +2699,204 @@ msgstr "Poziom: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Poziom: %d(%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Poproszono o wyjście z gildii %s."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kogo chcesz zaprosić do gildii %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Opuścić gildię?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "GPS"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Utwórz gildię"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Społeczność"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Zaproś"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -3081,33 +3088,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -3259,23 +3266,23 @@ msgstr "Obwódka lokalizacji domowej"
 msgid "Road Point"
 msgstr "Drogowskaz"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Gracze online- "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -3982,40 +3989,41 @@ msgstr ""
 "się problemy."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Zostałeś/aś zabity/a przez "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Zostałeś/aś zabity/a przez %s"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4023,384 +4031,388 @@ msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) szalone ruchy numer %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) atak"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr "(f) nie atakuj przyjaciół"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr "(d) nie atakuj nikogo"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "AFK"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) AFK"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) stan"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Widzisz "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opcje] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr "                  używane do wprowadzania własnych parametrów"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr "                  do klienta manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Używany plik logów"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Używany katalog logów"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Pokaż wersję"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Pokaż tą pomoc"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Katalog konfiguracyjny"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Zaloguj się tym loginem"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Zaloguj się tym hasłem"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Zaloguj się tą postacią"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Nazwa serwera lub IP"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port serwera"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Użyj tego serwera aktualizacji"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Wybierz domyślny serwer i postać"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Omiń aktualizację"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog z danymi gry"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --test          :Rozpocznij test sterowników i autokonfigurację"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Wyłącz OpenGL w tej sesji"
 
@@ -4456,7 +4468,7 @@ msgstr "Nieznany błąd serwera postaci."
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Nieprawidłowe imię."
 
@@ -4472,15 +4484,19 @@ msgstr "Nieprawidłowe włosy."
 msgid "Incorrect slot."
 msgstr "Nieprawidłowe miejsce inwentarza."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Nieprawidłowa rasa."
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Postać skasowana."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
@@ -4525,16 +4541,16 @@ msgstr "Wszystkie szepty odignorowane."
 msgid "All whispers unignore failed."
 msgstr "Nie udało się odignorować wszystkich szeptów."
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Gracze online: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Gra"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Żądanie wyjścia odrzucone!"
 
@@ -4624,11 +4640,11 @@ msgstr "Nieznana odpowiedź na zaproszenie do gildii."
 msgid "%s has left your guild."
 msgstr "%s opuścił/a Twoją gildię."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Zostałeś/aś wyrzucony/a z gildii."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Zostałeś/aś wykopany/a z gildii."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s wyrzucił/a Cię z gildii."
@@ -4771,39 +4787,39 @@ msgstr "Stare hasło nieprawidłowe."
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "Ważność konta wygasła."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Nie przyjęty przez serwer."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Klient jest zbyt nieaktualny."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4812,15 +4828,15 @@ msgstr ""
 "Dostałeś/aś tymczasowego bana do %s.\n"
 "Prosimy o kontakt z drużyną GM-ów przez fora."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Serwer jest przeciążony."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Login jest już w użyciu."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
@@ -5168,7 +5184,7 @@ msgstr "Handel anulowany."
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Siła"
 
@@ -5177,7 +5193,7 @@ msgstr "Siła"
 msgid "Strength %+.1f"
 msgstr "Siła %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Zwinność"
 
@@ -5186,7 +5202,7 @@ msgstr "Zwinność"
 msgid "Agility %+.1f"
 msgstr "Szybkość %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Zręczność"
 
@@ -5195,7 +5211,7 @@ msgstr "Zręczność"
 msgid "Dexterity %+.1f"
 msgstr "Zręczność %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Witalność"
 
@@ -5204,7 +5220,7 @@ msgstr "Witalność"
 msgid "Vitality %+.1f"
 msgstr "Witalność %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligencja"
 
@@ -5538,50 +5554,50 @@ msgstr "Nieznany błąd połączenia."
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Szczęście"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Obrona"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "Atak mag."
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "Obrona mag."
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% celności"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% uników"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% ciosów kryt."
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Opóźnienie ataku"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Opóźnienie chodu"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Zasięg ataku"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "Obrażenia na sek."
 
@@ -5602,47 +5618,47 @@ msgstr "Połączenie z serwerem przerwane."
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Pisz '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Mruganie nicka"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Bąbelek \"...\" nad głową"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Bąbelek nad głową"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "nienazwany"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Atak %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrona %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
diff --git a/po/pt.po b/po/pt.po
index ef93d70d9..b570120d5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,15 +4,15 @@
 #
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <freya.df@gmail.com>, 2011.
+#   <freya.df@gmail.com>, 2011, 2012.
 # freya <freya.df@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
 "Language: pt\n"
@@ -43,113 +43,113 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,160 +158,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:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
-msgstr ""
+msgstr "Inimigo"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -321,43 +321,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -392,7 +392,7 @@ msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
@@ -411,7 +411,7 @@ msgstr "Mover"
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Resetar"
 
@@ -434,16 +434,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -455,8 +455,8 @@ msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Máximo"
 
@@ -480,14 +480,14 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -519,7 +519,7 @@ msgid "The email address entries mismatch."
 msgstr "Os emails informados não são iguais."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -585,8 +585,8 @@ msgstr "Estilo do Cabelo:"
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Criar"
 
@@ -628,47 +628,47 @@ msgstr "Tem certeza que deseja excluir este personagem?"
 msgid "Account and Character Management"
 msgstr "Gerenciamento de Conta e Personagem"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Trocar Login"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -742,12 +742,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -911,7 +911,7 @@ msgid "Did You Know?"
 msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fechar"
@@ -939,8 +939,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -982,26 +982,26 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Dividir"
 
@@ -1015,17 +1015,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1248,31 +1248,27 @@ msgstr "Barra de Status"
 msgid "Need"
 msgstr "Precisa"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Aguarde"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Pare de esperar"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Próximo"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Para:"
@@ -1291,6 +1287,7 @@ msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1346,7 +1343,7 @@ msgstr "Lista Negra"
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr ""
+msgstr "Definir como inimigo."
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1374,7 +1371,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1426,7 +1423,7 @@ msgid "Show Items"
 msgstr "Mostar itens:"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Deixar sem Roupas"
 
@@ -1478,8 +1475,8 @@ msgstr "Jogadores"
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -1491,8 +1488,8 @@ msgstr "Mapa Item"
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "A Remover"
 
@@ -1501,8 +1498,8 @@ msgid "Warp"
 msgstr "Urdidura"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Carregar Antigas Roupas"
+msgid "Clear outfit"
+msgstr "Limpar equipamento"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1540,119 +1537,118 @@ msgstr "Habilitar longe do teclado"
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Sair"
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Copiar para o chat"
+msgstr "CopiaCopiar para a área de transferência"
 
 #: src/gui/popupmenu.cpp:849
 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:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -1749,11 +1745,11 @@ msgstr "Preparando download"
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -1980,7 +1976,7 @@ msgstr "Habilitar joystick"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Use joystick se a janela cliente estiver inativo"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -1992,7 +1988,7 @@ msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Girar o bastão e não pressionar os botões"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2176,7 +2172,7 @@ msgstr "Habilitar Analisador de bot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Habilitar proteção contra bugs no servidor (não pode ser desabilitado)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2316,7 +2312,7 @@ msgstr "Na Lista Negra "
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Inimigo"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2364,59 +2360,59 @@ msgstr "Enorme (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chinês (China)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Tcheco"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Inglês"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finlandês"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Francês"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Alemão"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonésio"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "Polonês"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "Japonês"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holandês (Bélgica / Flandres)"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
-msgstr ""
+msgstr "Português"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Português (Brasileiro)"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Russian"
-msgstr ""
+msgstr "Russo"
 
 #: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espanhol (castelhano)"
 
 #: src/gui/setup_theme.cpp:191
 msgid "Theme"
@@ -2428,7 +2424,7 @@ msgstr "Tema"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "Linguagem"
 
 #: src/gui/setup_theme.cpp:195
 msgid "Main Font"
@@ -2698,194 +2694,204 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Ignorar mobss"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3076,33 +3082,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3254,23 +3260,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3923,7 +3929,7 @@ msgstr "Trocar feitiço de ataque"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Trocar ataque de pvp"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -3979,430 +3985,434 @@ msgstr ""
 "comprometer a jogabilidade."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Você foi morto por "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Você foi morto por %s"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) Seguir em modo desconhecido"
+msgstr "(?) Movimento desconhecido"
 
-#: src/localplayer.cpp:1918
-#, fuzzy, c-format
+#: src/localplayer.cpp:1925
+#, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(?) movimentos loucos"
+msgstr "(%d) movimento louco numero %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) atacar todos inimigos"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) não atacar amigos"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) Ataque PVP"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2234
-#, fuzzy
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
-msgstr "Modificadores de jogo ativados"
+msgstr "Modificador de jogo desconhecido"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr "usado para definir parâmetros customizados"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr "para o cliente manaplus. "
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --testes          : Começar a testar drivers para auto configuração"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -4458,7 +4468,7 @@ msgstr "Erro desconhecido do char-server."
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Nome errado."
 
@@ -4474,15 +4484,19 @@ msgstr "Cabelo incorreto."
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Corrida incorreta:"
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informações"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -4527,16 +4541,16 @@ msgstr "Todos sussurros não-ignorados. "
 msgid "All whispers unignore failed."
 msgstr "Todos sussurros não-ignorados falharam. "
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Jogadores online: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Jogo"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
@@ -4626,11 +4640,11 @@ msgstr "Resposta desconhecida de convite para guilda."
 msgid "%s has left your guild."
 msgstr "%s saiu de sua Guilda."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Você foi expulso da Guilda."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Você foi expulso da guilda."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s foi expulso da Guilda."
@@ -4766,41 +4780,41 @@ msgstr "Senha antiga incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "A conta expirou."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Você foi permanentemente banido do jogo. Por favor entre em contato com "
 "algum GM."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4809,15 +4823,15 @@ msgstr ""
 "Você banido do jogo até %s.\n"
 "Por favor entre em contato com algum GM através do fórum."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Server lotado."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
@@ -5164,7 +5178,7 @@ msgstr "Negociação cancelada."
 msgid "Trade completed."
 msgstr "Negociação realizada."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Força"
 
@@ -5173,7 +5187,7 @@ msgstr "Força"
 msgid "Strength %+.1f"
 msgstr "Força %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Agilidade"
 
@@ -5182,7 +5196,7 @@ msgstr "Agilidade"
 msgid "Agility %+.1f"
 msgstr "Agilidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Destreza"
 
@@ -5191,7 +5205,7 @@ msgstr "Destreza"
 msgid "Dexterity %+.1f"
 msgstr "Destreza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalidade"
 
@@ -5200,7 +5214,7 @@ msgstr "Vitalidade"
 msgid "Vitality %+.1f"
 msgstr "Vitalidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligência"
 
@@ -5534,50 +5548,50 @@ msgstr "Erro de conexão desconhecido."
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Defesa"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
@@ -5598,143 +5612,47 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "sem nome"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Defesa %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Item desconhecido"
-
-#~ msgid "(?) move"
-#~ msgstr "(?) mover"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) Visualizador de mapa"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D)  Modo de jogo câmera design"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(4)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 38e5b43df..f82ba68ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-#   <alasmirt@gmail.com>, 2011.
+#   <alasmirt@gmail.com>, 2011, 2012.
 # alastrim <alasmirt@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <freya.df@gmail.com>, 2011.
+#   <freya.df@gmail.com>, 2011, 2012.
 # freya <freya.df@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -45,113 +45,113 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "por peso"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "por quantidade"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "por tipo"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Habilitar rolagem preguisoça "
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Rolagem preguiçosa"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, 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:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, 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:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +160,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:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
-msgstr ""
+msgstr "inimigo"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -323,43 +323,43 @@ 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:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -394,7 +394,7 @@ msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
@@ -413,7 +413,7 @@ msgstr "Mover"
 msgid "Result"
 msgstr "Resultado"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Resetar"
 
@@ -436,16 +436,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -457,8 +457,8 @@ msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Máximo"
 
@@ -482,14 +482,14 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -521,7 +521,7 @@ msgid "The email address entries mismatch."
 msgstr "Os emails informados não são iguais."
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -587,8 +587,8 @@ msgstr "Estilo do Cabelo:"
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Criar"
 
@@ -630,47 +630,47 @@ msgstr "Tem certeza que deseja excluir este personagem?"
 msgid "Account and Character Management"
 msgstr "Gerenciamento de Conta e Personagem"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Trocar Login"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Alterar email"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Escolher"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Nível %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(vazio)"
 
@@ -744,12 +744,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -913,7 +913,7 @@ msgid "Did You Know?"
 msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Fechar"
@@ -941,8 +941,8 @@ msgstr "Equipamento"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -984,26 +984,26 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Dividir"
 
@@ -1017,17 +1017,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1250,31 +1250,27 @@ msgstr "Barra de Status"
 msgid "Need"
 msgstr "Precisa"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Aguarde"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Parar de esperar"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Próximo"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Próximo"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Para:"
@@ -1293,6 +1289,7 @@ msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -1348,7 +1345,7 @@ msgstr "Lista Negra"
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr ""
+msgstr "Definir como inimigo"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1376,7 +1373,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1428,7 +1425,7 @@ msgid "Show Items"
 msgstr "Mostrar itens:"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Despir"
 
@@ -1480,8 +1477,8 @@ msgstr "Jogadores"
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -1493,8 +1490,8 @@ msgstr "Mapa Item"
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Remover"
 
@@ -1503,8 +1500,8 @@ msgid "Warp"
 msgstr "Urdidura"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Carregar velhas roupas"
+msgid "Clear outfit"
+msgstr "Limpar conjunto de roupas"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1542,119 +1539,118 @@ msgstr "Habilitar modo indisponível"
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Sair"
 
 #: src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Copy to clipboard"
-msgstr "Copiar para chat"
+msgstr "Copiar para a área de transferência"
 
 #: src/gui/popupmenu.cpp:849
 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:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -1751,11 +1747,11 @@ msgstr "Preparando download"
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -1982,7 +1978,7 @@ msgstr "Habilitar joystick"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Usar joystick se a janela do cliente estiver inativa"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -1994,7 +1990,7 @@ msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Gire o bastão e não aperte os botões"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2178,7 +2174,7 @@ msgstr "Habilitar Analisador de bot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2318,7 +2314,7 @@ msgstr "Na Lista Negra "
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Inimigo"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2366,59 +2362,59 @@ msgstr "Enorme (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chinês(China)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Tcheco"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Inglês"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finlandês"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Francês"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Alemão"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonésio"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "Polonês"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "Japonês"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holandês"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
-msgstr ""
+msgstr "Português"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Português (Brasileiro)"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Russian"
-msgstr ""
+msgstr "Russo"
 
 #: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espanhol"
 
 #: src/gui/setup_theme.cpp:191
 msgid "Theme"
@@ -2430,7 +2426,7 @@ msgstr "Tema"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "Linguagem"
 
 #: src/gui/setup_theme.cpp:195
 msgid "Main Font"
@@ -2700,194 +2696,204 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Convidar"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3078,33 +3084,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3256,23 +3262,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3925,7 +3931,7 @@ msgstr "Trocar feitiço de ataque"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Mudar ataque em pvp"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -3981,430 +3987,433 @@ msgstr ""
 "comprometer a jogabilidade."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Você foi morto por "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Você foi morto por %s"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1896
-#, fuzzy
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
-msgstr "(?) Seguir em modo desconhecido"
+msgstr "(?) movimento desconhecido"
 
-#: src/localplayer.cpp:1918
-#, fuzzy, c-format
+#: src/localplayer.cpp:1925
+#, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(?) Movimentos loucos"
+msgstr "(%d) movimento louco número %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) atacar qualquer jogador"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) não atacar amigos"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) ataque em pvp"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2234
-#, fuzzy
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
-msgstr "Modificadores de jogo desativados"
+msgstr "Modificadores são desconhecidos"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr "Manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr "Usado para parâmetros customizados"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr "Para o cliente Manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr "  -T --testes          : Começa a testar drivers e a auto-configurar"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -4460,7 +4469,7 @@ msgstr "Erro desconhecido do char-server."
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Nome errado."
 
@@ -4476,15 +4485,19 @@ msgstr "Cabelo incorreto."
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Corrida incorreta."
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Informações"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -4529,16 +4542,16 @@ msgstr "Todos sussurros não-ignorados."
 msgid "All whispers unignore failed."
 msgstr "Todos sussurros não-ignorados falharam. "
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Jogadores online: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Jogo"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
@@ -4628,11 +4641,11 @@ msgstr "Resposta desconhecida de convite para guilda."
 msgid "%s has left your guild."
 msgstr "%s saiu de sua Guilda."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "Você foi expulso da Guilda."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr "Você foi expulso da guilda."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s foi expulso da Guilda."
@@ -4768,41 +4781,41 @@ msgstr "Senha antiga incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "A conta expirou."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Você foi permanentemente banido do jogo. Por favor entre em contato com "
 "algum GM."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4811,15 +4824,15 @@ msgstr ""
 "Você banido do jogo até %s.\n"
 "Por favor entre em contato com algum GM através do fórum."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Servidor lotado."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente. "
 
@@ -5166,7 +5179,7 @@ msgstr "Negociação cancelada."
 msgid "Trade completed."
 msgstr "Negociação realizada."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Força"
 
@@ -5175,7 +5188,7 @@ msgstr "Força"
 msgid "Strength %+.1f"
 msgstr "Força %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Agilidade"
 
@@ -5184,7 +5197,7 @@ msgstr "Agilidade"
 msgid "Agility %+.1f"
 msgstr "Agilidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Destreza"
 
@@ -5193,7 +5206,7 @@ msgstr "Destreza"
 msgid "Dexterity %+.1f"
 msgstr "Destreza %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalidade"
 
@@ -5202,7 +5215,7 @@ msgstr "Vitalidade"
 msgid "Vitality %+.1f"
 msgstr "Vitalidade %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligência"
 
@@ -5536,50 +5549,50 @@ msgstr "Erro de conexão desconhecido."
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Sorte"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Defesa"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "Atq. Mágico"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "Dano por seg."
 
@@ -5600,143 +5613,47 @@ msgstr "Conexão com o servidor interrompida. "
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "sem nome"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Defesa %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Item desconhecido"
-
-#~ msgid "(?) move"
-#~ msgstr "(?) mover"
-
-#~ msgid "(?) map view"
-#~ msgstr "(?) Visualizador de mapa"
-
-#~ msgid "(D) design camera mode"
-#~ msgstr "(D)  Modo de jogo câmera design"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(l)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/ru.po b/po/ru.po
index a5ea00a0c..6beede284 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Andrei Karas <akaras@inbox.ru>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011, 2012.
 # Necromonger <Necromong@inbox.ru>, 2011.
 #   <Necromong@inbox.ru>, 2011.
 #   <reslayer@mail.ru>, 2011.
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-12-08 14:11+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:28+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
 "Language: ru\n"
@@ -45,113 +45,113 @@ msgstr "О"
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,105 +160,105 @@ msgstr ""
 "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
 "уже создана, или этот игрок Вы сами."
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr "добавлен в черный список"
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr "враг"
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -266,7 +266,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -274,7 +274,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -282,7 +282,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -290,7 +290,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -298,27 +298,27 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -329,43 +329,43 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -400,7 +400,7 @@ msgstr "Имя"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Атака"
 
@@ -419,7 +419,7 @@ msgstr "Движение"
 msgid "Result"
 msgstr "Результат"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -442,16 +442,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -463,8 +463,8 @@ msgid "Quit"
 msgstr "Выход"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "Макс"
 
@@ -488,14 +488,14 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -527,7 +527,7 @@ msgid "The email address entries mismatch."
 msgstr "Адрес E-mail не совпадает"
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Изменить пароль"
 
@@ -593,8 +593,8 @@ msgstr "Стрижка:"
 msgid "Race:"
 msgstr "Раса:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Создать"
 
@@ -636,47 +636,47 @@ msgstr "Вы уверены, что хотите удалить этого пе�
 msgid "Account and Character Management"
 msgstr "Управление учётной записью"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "Сменить героя"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "Нправильный пароль"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "Выбрать"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "Уровень: %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "(пусто)"
 
@@ -750,12 +750,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -919,7 +919,7 @@ msgid "Did You Know?"
 msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "Закрыть"
@@ -947,8 +947,8 @@ msgstr "Снаряжение"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "Снять"
 
@@ -990,26 +990,26 @@ msgid "Filter:"
 msgstr "Фильтр:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "Разделить"
 
@@ -1023,17 +1023,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Бросить"
@@ -1258,31 +1258,27 @@ msgstr "статус"
 msgid "Need"
 msgstr "Нужно"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Ожидание ответа от сервера"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr "Остановить ожидание"
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Следующий"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Применить"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Далее"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Для:"
@@ -1301,6 +1297,7 @@ msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
@@ -1384,7 +1381,7 @@ msgstr "Не игнорировать"
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
@@ -1436,7 +1433,7 @@ msgid "Show Items"
 msgstr "Показать предметы"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr "Раздеть"
 
@@ -1488,8 +1485,8 @@ msgstr "Игроки"
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
@@ -1501,8 +1498,8 @@ msgstr "Элмент карты"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1511,8 +1508,8 @@ msgid "Warp"
 msgstr "Прыгнуть"
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
-msgstr "Загрузить старые наряды"
+msgid "Clear outfit"
+msgstr "Очистить наряд"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1550,7 +1547,7 @@ msgstr "Рарешить режим отошел"
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -1563,105 +1560,105 @@ msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "Имя:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "Комментарий             "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "Комментарий:                      "
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -1758,11 +1755,11 @@ msgstr "Подготовка к загрузке"
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -2714,194 +2711,204 @@ msgstr "Уровень: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Гильдия"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Выход из гильдии %s запрошен."
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "Приглашение игрока в Гильдию"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого вы хотите пригласить в гильдию %s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "Покинуть Гильдию?"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Группа"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr "Нав"
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr "Атк"
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Общество"
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr "И"
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr "Д"
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не порвое."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr "Имя группы"
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -3093,33 +3100,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "Завершено"
 
@@ -3271,23 +3278,23 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3997,40 +4004,41 @@ msgstr ""
 "вести."
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "Вы были убиты "
+#, c-format
+msgid "You were killed by %s"
+msgstr "Вас убил %s"
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4038,385 +4046,390 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) сумасшедшее движение %d"
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr "(f) атаковать всех кроме друзей"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr "(d) не атаковать игроков"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "Вы видите "
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [параметры] [файл-manaplus]"
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr "                  используется для указания дополнительных параметров"
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr "                  в клиенте."
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "Опции:"
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Использовать указанный файл как лог"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Использовать указанный каталог для лога"
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Показать версию"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Показать эту справку"
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Использовать указанный каталог конфигурации"
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Войти с указанным логином"
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Войти с указанным паролем"
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Использовать указанный персонаж"
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Имя или IP сервера авторизации"
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Порт сервера авторизации"
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Использовать этот узел обновлений"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Пропустить обновление"
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Загрузить игровые данные из этого каталога"
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Каталог для локальных данных"
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Сохранять скриншоты в указанном каталоге"
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Запуск игры в безопасном режиме"
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+"  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Не использовать OpenGL для этой сессии"
 
@@ -4473,7 +4486,7 @@ msgstr "Неизвестная ошибка сервера персонажей.
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
@@ -4489,15 +4502,19 @@ msgstr "Некорректный тип волос."
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr "Неправильная расса."
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Сведения"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "Персонаж удален"
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
@@ -4542,16 +4559,16 @@ msgstr "Убрано игнорирование всех приватных со
 msgid "All whispers unignore failed."
 msgstr "Не удалось убрать игнорирование всех приватных сообщение."
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "Пользователей онлайн: %d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "Игра"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr "Запрос на выход отклонен!"
 
@@ -4641,11 +4658,11 @@ msgstr "Неизвестный ответ на приглашение в гил�
 msgid "%s has left your guild."
 msgstr "%s покинул Вашу гильдию."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr "Вы были кикнуты из гильдии."
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s был вышвырнут из Вашей гильдии."
@@ -4779,39 +4796,39 @@ msgstr "Старый пароль указан неверно."
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID"
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "Неверный пароль"
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера.."
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "Клиент устарел"
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4819,15 +4836,15 @@ msgid ""
 msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr "Сервер переполнен"
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr "Пользователь удален"
 
@@ -5173,7 +5190,7 @@ msgstr "Торговля отменена."
 msgid "Trade completed."
 msgstr "Торговля завершена."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Сила (str)"
 
@@ -5182,7 +5199,7 @@ msgstr "Сила (str)"
 msgid "Strength %+.1f"
 msgstr "Сила (str) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Выносливость (agi)"
 
@@ -5191,7 +5208,7 @@ msgstr "Выносливость (agi)"
 msgid "Agility %+.1f"
 msgstr "Выносливость (agi) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Ловкость (dex)"
 
@@ -5200,7 +5217,7 @@ msgstr "Ловкость (dex)"
 msgid "Dexterity %+.1f"
 msgstr "Ловкость (dex) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Живучесть (vit)"
 
@@ -5209,7 +5226,7 @@ msgstr "Живучесть (vit)"
 msgid "Vitality %+.1f"
 msgstr "Живучесть (vit) %+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Интеллект (int)"
 
@@ -5547,50 +5564,50 @@ msgstr "Неизвестная ошибка подключения."
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Удача (luk)"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "Защита"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr "Маг. Атака"
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "Зона атаки"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "Урон в сек."
 
@@ -5611,47 +5628,47 @@ msgstr "Подключение к серверу прервано."
 msgid "%s is not in your party!"
 msgstr "%s не в группе!"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr "Печатать '...'"
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr "Мигать именем"
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr "Плавающий '...' пузырек"
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "безымянный"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Атака %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Защита %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Мана %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a2071b23..c8b454e0c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-12-10 01:54+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -43,268 +43,268 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:878 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:885 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:890 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:895
+#: src/client.cpp:964
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:977
+#: src/client.cpp:1046
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1008
+#: src/client.cpp:1077
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1110
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1142
+#: src/client.cpp:1211
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1242
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1183
+#: src/client.cpp:1252
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1226 src/client.cpp:1233 src/client.cpp:1367
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:254
+#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:167
-#: src/net/ea/charserverhandler.cpp:185 src/net/manaserv/charhandler.cpp:184
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1311
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1268
+#: src/client.cpp:1337
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1269
+#: src/client.cpp:1338
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1288
+#: src/client.cpp:1357
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1289
+#: src/client.cpp:1358
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1309
+#: src/client.cpp:1378
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1310
+#: src/client.cpp:1379
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1509 src/client.cpp:1539 src/client.cpp:1554
-#: src/client.cpp:1979 src/client.cpp:1986
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1685
+#: src/client.cpp:1770
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1719 src/client.cpp:1725
+#: src/client.cpp:1804 src/client.cpp:1810
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1746
+#: src/client.cpp:1831
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:212
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:330
+#: src/commandhandler.cpp:332
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:344
+#: src/commandhandler.cpp:346
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:366
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:380 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:391
+#: src/commandhandler.cpp:393
 msgid "Guild name is missing."
 msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:404 src/commandhandler.cpp:522
-#: src/commandhandler.cpp:563 src/commandhandler.cpp:603
+#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
+#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:457
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:467
+#: src/commandhandler.cpp:468
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:473
+#: src/commandhandler.cpp:474
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:501
+#: src/commandhandler.cpp:502
 msgid "friend"
 msgstr "朋友"
 
-#: src/commandhandler.cpp:506
+#: src/commandhandler.cpp:507
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:511
+#: src/commandhandler.cpp:512
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:530
+#: src/commandhandler.cpp:531
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:544
+#: src/commandhandler.cpp:545
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:552
+#: src/commandhandler.cpp:553
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s"
 
-#: src/commandhandler.cpp:575
+#: src/commandhandler.cpp:576
 msgid "Player wasn't ignored!"
 msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:582
+#: src/commandhandler.cpp:583
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:585
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:591
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:595
+#: src/commandhandler.cpp:596
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:610
+#: src/commandhandler.cpp:611
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:621
+#: src/commandhandler.cpp:622
 msgid "Player successfully erased!"
 msgstr "玩家成功删除！"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:624
 msgid "Player could not be erased!"
 msgstr "玩家无法删除！"
 
-#: src/commandhandler.cpp:930 src/commandhandler.cpp:976
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:940
+#: src/commandhandler.cpp:941
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:949
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1052
+#: src/commandhandler.cpp:1053
 msgid "font cache size"
 msgstr "字体缓存大小"
 
-#: src/commandhandler.cpp:1064
+#: src/commandhandler.cpp:1065
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1068
+#: src/commandhandler.cpp:1069
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1070
+#: src/commandhandler.cpp:1071
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1172 src/commandhandler.cpp:1179
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1174 src/commandhandler.cpp:1181
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -313,43 +313,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:506
+#: src/game.cpp:508
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:514
+#: src/game.cpp:516
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:554
+#: src/game.cpp:558
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:557
+#: src/game.cpp:559
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1258
+#: src/game.cpp:1270
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1268
+#: src/game.cpp:1280
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1773
+#: src/game.cpp:1786
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1774
+#: src/game.cpp:1787
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -384,7 +384,7 @@ msgstr "姓名"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
 #: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻击"
 
@@ -403,7 +403,7 @@ msgstr "移动"
 msgid "Result"
 msgstr "结果"
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "重置"
 
@@ -426,16 +426,16 @@ 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:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:755
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 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:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:767
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
@@ -447,8 +447,8 @@ msgid "Quit"
 msgstr "退出"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:505 src/gui/statuswindow.cpp:555
-#: src/gui/statuswindow.cpp:754 src/gui/statuswindow.cpp:785
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
 msgid "Max"
 msgstr "最大"
 
@@ -472,14 +472,14 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:550 src/gui/popupmenu.cpp:576
 #: src/gui/popupmenu.cpp:592 src/gui/popupmenu.cpp:613
 #: src/gui/popupmenu.cpp:841 src/gui/popupmenu.cpp:867
-#: src/gui/popupmenu.cpp:1840 src/gui/popupmenu.cpp:1870
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
-#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2053
-#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2129
+#: src/gui/popupmenu.cpp:1850 src/gui/popupmenu.cpp:1880
+#: src/gui/popupmenu.cpp:1938 src/gui/popupmenu.cpp:1985
+#: src/gui/popupmenu.cpp:2022 src/gui/popupmenu.cpp:2063
+#: src/gui/popupmenu.cpp:2117 src/gui/popupmenu.cpp:2139
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
+#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "取消"
 
@@ -511,7 +511,7 @@ msgid "The email address entries mismatch."
 msgstr "电子邮件地址不匹配。"
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "更换密码"
 
@@ -577,8 +577,8 @@ msgstr "发型："
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:481
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "建立"
 
@@ -620,47 +620,47 @@ msgstr "你确定想删除这个角色？"
 msgid "Account and Character Management"
 msgstr "帐号和角色管理"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr "登录"
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr "变更电子邮件"
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:411 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
 #: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr "选择"
 
-#: src/gui/charselectdialog.cpp:472
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr "等级 %d"
 
-#: src/gui/charselectdialog.cpp:483 src/gui/charselectdialog.cpp:484
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr "()"
 
@@ -734,12 +734,12 @@ msgstr "？？？"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:649
+#: src/gui/chatwindow.cpp:650
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1036
+#: src/gui/chatwindow.cpp:1037
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -903,7 +903,7 @@ msgid "Did You Know?"
 msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
 msgid "Close"
 msgstr "关闭"
@@ -931,8 +931,8 @@ msgstr "装备"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1898
-#: src/gui/popupmenu.cpp:1945
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:1955
 msgid "Unequip"
 msgstr "卸下装备"
 
@@ -974,26 +974,26 @@ msgid "Filter:"
 msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1804
-#: src/gui/popupmenu.cpp:1900 src/gui/popupmenu.cpp:1947
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1808
-#: src/gui/popupmenu.cpp:1865 src/gui/popupmenu.cpp:1904
-#: src/gui/popupmenu.cpp:1951
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
+#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
+#: src/gui/popupmenu.cpp:1961
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
-#: src/gui/popupmenu.cpp:1956
+#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
+#: src/gui/popupmenu.cpp:1966
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1822
-#: src/gui/popupmenu.cpp:1918 src/gui/popupmenu.cpp:1965
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
+#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
 msgid "Split"
 msgstr "分离"
 
@@ -1007,17 +1007,17 @@ msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1921
-#: src/gui/popupmenu.cpp:1968 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
+#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1829
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1914 src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
+#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1238,31 +1238,27 @@ msgstr "状态栏"
 msgid "Need"
 msgstr "需要"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "等待服务器中"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "下一个"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "提交"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
 #: src/gui/setup_other.cpp:151
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
 msgid "Clear"
 msgstr "清除"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "至："
@@ -1281,6 +1277,7 @@ msgid "Outfit: %d"
 msgstr "套装： %d"
 
 #: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
@@ -1364,7 +1361,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
 #: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:447
+#: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -1416,7 +1413,7 @@ msgid "Show Items"
 msgstr "显示项目"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2126
+#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
 msgid "Undress"
 msgstr ""
 
@@ -1468,8 +1465,8 @@ msgstr "玩家"
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1838
-#: src/gui/popupmenu.cpp:1922 src/gui/popupmenu.cpp:1969
+#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -1481,8 +1478,8 @@ msgstr "地图项"
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2085
-#: src/gui/popupmenu.cpp:2096 src/gui/popupmenu.cpp:2100
+#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
 msgid "Remove"
 msgstr ""
 
@@ -1491,7 +1488,7 @@ msgid "Warp"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:589
-msgid "Load old outfits"
+msgid "Clear outfit"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
@@ -1530,7 +1527,7 @@ msgstr "启用远"
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
 msgid "Leave"
 msgstr "留下"
 
@@ -1543,105 +1540,105 @@ msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1326
+#: src/gui/popupmenu.cpp:1335
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1328
+#: src/gui/popupmenu.cpp:1337
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1378
+#: src/gui/popupmenu.cpp:1382
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1380
+#: src/gui/popupmenu.cpp:1384
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1776
+#: src/gui/popupmenu.cpp:1786
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1780
+#: src/gui/popupmenu.cpp:1790
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1781
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1782
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1802
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1803
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1910
-#: src/gui/popupmenu.cpp:1957
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1834
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1835
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1868 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1983
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2001 src/gui/popupmenu.cpp:2038
+#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:2007 src/gui/popupmenu.cpp:2044
+#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:2050
+#: src/gui/popupmenu.cpp:2060
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2052 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2072 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
+#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:2082 src/gui/popupmenu.cpp:2093
+#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:2084 src/gui/popupmenu.cpp:2095
+#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
 msgstr ""
 
@@ -1738,11 +1735,11 @@ msgstr "准备下载"
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -2682,194 +2679,204 @@ msgstr "等级: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:173
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:187
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:214
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:215
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:224
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:225
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "t"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:373
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:387
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:414
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:424
 msgid "Leave Party?"
 msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:425
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:649
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:927
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1000
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1261
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1424
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1441
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1454
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1501
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1524
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1538
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1539
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1553
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1559
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1565
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1580
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1591
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1595
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1603
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1608
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1617
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1632
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1637
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1638
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -3059,33 +3066,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:139
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:166
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:169
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updaterwindow.cpp:565
+#: src/gui/updaterwindow.cpp:570
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:567
+#: src/gui/updaterwindow.cpp:572
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:569
+#: src/gui/updaterwindow.cpp:574
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:745
+#: src/gui/updaterwindow.cpp:750
 msgid "Completed"
 msgstr "已完成"
 
@@ -3237,23 +3244,23 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:88 src/gui/whoisonline.cpp:563
+#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
-#: src/gui/whoisonline.cpp:111
+#: src/gui/whoisonline.cpp:113
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:196
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:577
+#: src/gui/whoisonline.cpp:586
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:611
+#: src/gui/whoisonline.cpp:625
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3958,423 +3965,428 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:384
-msgid "You were killed by "
-msgstr "你被打死"
+#, c-format
+msgid "You were killed by %s"
+msgstr ""
 
-#: src/localplayer.cpp:1438
+#: src/localplayer.cpp:1439
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1442
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1445
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1448
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1451
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1454
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1457
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1481
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1891
+#: src/localplayer.cpp:1898
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1892
+#: src/localplayer.cpp:1899
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1900
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1901
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1902
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1903
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1918
+#: src/localplayer.cpp:1925
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1923
+#: src/localplayer.cpp:1930
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1927
+#: src/localplayer.cpp:1934
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1941
+#: src/localplayer.cpp:1948
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1949
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1950
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1951
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1952
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1953
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1954
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1955
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1956
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1975
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1976
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1977
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1978
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1979
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991 src/localplayer.cpp:1995 src/localplayer.cpp:2018
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:1992 src/localplayer.cpp:2014
+#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:1993
+#: src/localplayer.cpp:2000
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1994
+#: src/localplayer.cpp:2001
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2015
+#: src/localplayer.cpp:2022
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2016
+#: src/localplayer.cpp:2023
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2024
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2051
+#: src/localplayer.cpp:2058
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2052
+#: src/localplayer.cpp:2059
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2060
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2061
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2062
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2063
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2064
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2065
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2078
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2079
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2080
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2081
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2082
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2083
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2102
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2103
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2104
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2105
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2106
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2107
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2126
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2127
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2128
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2129
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2130
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2142
+#: src/localplayer.cpp:2149
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2150
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2151
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2172
+#: src/localplayer.cpp:2179
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2191
+#: src/localplayer.cpp:2198
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2199
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2193 src/localplayer.cpp:2208
+#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2206
+#: src/localplayer.cpp:2213
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2207
+#: src/localplayer.cpp:2214
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2232
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2233
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2241
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3750
+#: src/localplayer.cpp:3758
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3752 src/localplayer.cpp:3767
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3759
+#: src/localplayer.cpp:3767
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3761 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4117
+#: src/localplayer.cpp:4125
 msgid "You see "
 msgstr "你看"
 
-#: src/main.cpp:47
+#: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:53
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:54
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:56
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:54
+#: src/main.cpp:57
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l--log-file 日志文件"
 
-#: src/main.cpp:55
+#: src/main.cpp:58
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:59
 msgid "  -v --version        : Display the version"
 msgstr "-v --version: 显示版本"
 
-#: src/main.cpp:57
+#: src/main.cpp:60
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:61
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:62
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:63
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:64
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:65
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:66
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:67
 msgid "     --update-host    : Use this update host"
 msgstr "--update-host:    使用此更新主机"
 
-#: src/main.cpp:65
+#: src/main.cpp:68
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:70
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:71
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:73
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:75
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:76
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:77
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:80
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4430,7 +4442,7 @@ msgstr ""
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用。"
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
 msgid "Wrong name."
 msgstr "错误的名称。"
 
@@ -4446,15 +4458,19 @@ msgstr "不正确的头发。"
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:179 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "信息"
 
-#: src/net/ea/charserverhandler.cpp:179
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr "角色已删除。"
 
-#: src/net/ea/charserverhandler.cpp:185
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr "删除角色失败。"
 
@@ -4499,16 +4515,16 @@ msgstr ""
 msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr "在线用户数：%d"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr "游戏"
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4598,11 +4614,11 @@ msgstr "未知工会邀请响应."
 msgid "%s has left your guild."
 msgstr "%s已经离开工会."
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
-msgstr "你已经被工会开除！."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s已经被工会开除."
@@ -4735,39 +4751,39 @@ msgstr "旧密码不正确。"
 msgid "New password too short."
 msgstr "新密码太短。"
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "未知的错误。"
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:213
 msgid "Unregistered ID."
 msgstr "未注册的ID。"
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:216
 msgid "Wrong password."
 msgstr "错误的密码。"
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:219
 msgid "Account expired."
 msgstr "账户过期失效。"
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:222
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:225
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:229
 msgid "Client too old."
 msgstr "客户端太旧。"
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:232
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4776,15 +4792,15 @@ msgstr ""
 "你被暂时禁止进入游戏直到%s.\n"
 "请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:239
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:242
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:248
 msgid "Username permanently erased."
 msgstr ""
 
@@ -5124,7 +5140,7 @@ msgstr "交易取消。"
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "力量"
 
@@ -5133,7 +5149,7 @@ msgstr "力量"
 msgid "Strength %+.1f"
 msgstr "力量%+.1f"
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "敏捷"
 
@@ -5142,7 +5158,7 @@ msgstr "敏捷"
 msgid "Agility %+.1f"
 msgstr "敏捷 %+.1f"
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "敏捷"
 
@@ -5151,7 +5167,7 @@ msgstr "敏捷"
 msgid "Dexterity %+.1f"
 msgstr "灵巧%+.1f"
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "生命"
 
@@ -5160,7 +5176,7 @@ msgstr "生命"
 msgid "Vitality %+.1f"
 msgstr "活力%+.1f"
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "智慧"
 
@@ -5492,50 +5508,50 @@ msgstr "未知的连接错误。"
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "幸运"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr "防御"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr "步行延迟"
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr "攻击范围"
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
@@ -5556,134 +5572,47 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:461
+#: src/playerrelations.cpp:479
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:499
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:525
+#: src/playerrelations.cpp:543
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:528
+#: src/playerrelations.cpp:546
 msgid "Floating bubble"
 msgstr "流动的泡沫"
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "未知怪兽"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "攻击 %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "防御 %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "未知物品"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(I)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
author	Reid <reidyaro@gmail.com>	2012-01-25 22:05:36 +0100
committer	Reid <reidyaro@gmail.com>	2012-01-25 22:05:36 +0100
commit	8b612abb42853a22c1a9545e2c9280d154646543 (patch)
tree	f466167087c2b2de4b8aa9e6d1d1986f72f84147 /po
parent	a913dd41df61760de6ece552f941e002251ff54c (diff)
parent	d340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
download	manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2 manaplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz manaplus-8b612abb42853a22c1a9545e2c9280d154646543.zip