Update and rebuild translations.

14 files changed, 6104 insertions, 5794 deletions

diff --git a/po/cs.po b/po/cs.po
index 107933f31..8759c9040 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
 "PO-Revision-Date: 2012-02-02 16:45+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
@@ -43,47 +43,47 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,50 +93,50 @@ msgstr "Zaměňuji herní servery"
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -325,43 +325,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -394,20 +394,20 @@ msgstr "Ověřovač botů"
 msgid "Name"
 msgstr "Jméno"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Útok"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Mluvit"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -420,8 +420,8 @@ msgid "Reset"
 msgstr "Vynulovat"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Nákup"
 
@@ -469,8 +469,8 @@ msgstr "Vše"
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -480,18 +480,18 @@ msgstr "Prodej"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -527,7 +527,7 @@ msgstr "Emailové adresy nesouhlasí."
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Heslo:"
@@ -559,7 +559,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -595,7 +595,7 @@ msgid "Race:"
 msgstr "Rasa:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -738,7 +738,7 @@ msgid "rainbow 3"
 msgstr "duhová 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -769,13 +769,13 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -915,25 +915,25 @@ msgstr "Příchozí: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Odchozí: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Víte že ... ?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Předchozí"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Další >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Automaticky otevírat toto okno"
 
@@ -973,12 +973,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Odstranit z vybavení"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1016,31 +1016,31 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Vybavit"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Použít"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Upustit..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Rozdělit"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Výstroje"
 
@@ -1049,17 +1049,17 @@ msgid "Weight:"
 msgstr "Hmotnost:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Uložit"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Vzít"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upustit"
@@ -1203,43 +1203,43 @@ msgstr "Jack O se rodí"
 msgid "You have left the guild."
 msgstr "Opustil jsi gildu."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr ""
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Automaticky zavírat"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Přihlášení"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Vlastní host updatů"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Pamatovat přihlášení"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Updaty:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Změnit server"
 
@@ -1300,7 +1300,7 @@ msgstr "Odeslat"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Vyprázdnit"
 
@@ -1335,355 +1335,355 @@ msgstr "Nejdřív odstrojit"
 msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Obchod"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Šeptat"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Vyléčit"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Být přátelé"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Přehlížet"
 
-#: 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: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:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
-#: src/gui/popupmenu.cpp:702
-msgid "Set as enemy"
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
 msgstr ""
 
 #: 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:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
 #: 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
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Vymazat"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Následovat"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "imitovat"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Vykopnout hráče"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Svléct"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Přidat komentář"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Vykopnout"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Hráči"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Sebrat"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Vložit do chatu"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Označit na mapě"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Odebrat"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Kouzla"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Načíst stará kouzla"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "vypnout zvýrazǒvání"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Odejít"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 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:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Jméno:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Hráčův komentář"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Komentář:                      "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Přidat do transakce"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Přidat 10 do transakce"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Přidat polovinu do transakce"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Přidat vše do transakce"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Uschovat 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Uschovat všechny"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Upustit vše"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Načíst staré zkratky věcí"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Načíst staré zkratky upuštění"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Skrýt"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Zobrazit"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Posunout nahoru"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2705,6 +2705,14 @@ msgstr "Zvýšit"
 msgid "Skill points available: %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2715,6 +2723,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2725,204 +2738,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Požadován odchod z gildy %s."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Člen pozval do gildy"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Opustit gildu?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Parta"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Vytvořit gildu"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Společenství"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Název gildy"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 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:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1592
 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:1595
+#: src/gui/socialwindow.cpp:1596
 #, 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:1603
+#: src/gui/socialwindow.cpp:1604
 #, 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:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Jméno party"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -3112,33 +3125,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Hrát"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později"
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -4010,42 +4023,42 @@ msgstr ""
 "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
 "chovat podivně."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4053,388 +4066,398 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+#, fuzzy
+msgid "xp"
+msgstr "Exp:"
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#, fuzzy
+msgid "job"
+msgstr "pruh práce"
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) útok"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr před 2x3 pole"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) away"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Vidíte "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4492,7 +4515,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
@@ -4785,66 +4808,66 @@ msgstr "Pokus o použití předmětu selhal."
 msgid "Unable to equip."
 msgstr "Nelze vybavit."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Účet nenalezen, prosím přihlaste se znovu."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Půvoní heslo je nesprávné."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "Neregistované ID."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "Platnost účtu vypršela."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Odmítnut ze serveru."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Klient je příliš starý."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, 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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Server je přelidněný."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Toto uživatelské jméno je již používáno."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
diff --git a/po/de.po b/po/de.po
index 497e53986..40a2199df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
@@ -47,47 +47,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Leistung"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
-msgstr ""
+msgstr "Themen"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -97,50 +97,50 @@ msgstr "Charakterserver wechseln"
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -298,11 +298,11 @@ msgstr[1] "%d Sekunden"
 
 #: src/commandhandler.cpp:1060
 msgid "font cache size"
-msgstr ""
+msgstr "Schrift-Cache Größe"
 
 #: src/commandhandler.cpp:1072
 msgid "Cache size:"
-msgstr ""
+msgstr "Cache-Größe:"
 
 #: src/commandhandler.cpp:1076
 msgid "Created:"
@@ -314,7 +314,7 @@ msgstr "Gelöscht:"
 
 #: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
-msgstr ""
+msgstr "Bild-Quellen:"
 
 #: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
@@ -326,43 +326,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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -395,20 +395,20 @@ msgstr "Bot-Prüfer"
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Sprechen"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Bewegen"
 
@@ -421,8 +421,8 @@ msgid "Reset"
 msgstr "Zurücksetzten"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -470,8 +470,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Laden"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -481,18 +481,18 @@ msgstr "Verkaufen"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -528,7 +528,7 @@ msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Passwort:"
@@ -557,10 +557,10 @@ msgstr "Die Passwörter stimmen nicht überein."
 
 #: src/gui/charcreatedialog.cpp:70
 msgid "New Character"
-msgstr ""
+msgstr "Neuer Charakter"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Name :"
 
@@ -589,14 +589,14 @@ msgstr "Frisur:"
 
 #: src/gui/charcreatedialog.cpp:112
 msgid "^"
-msgstr ""
+msgstr "^"
 
 #: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Rasse:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Erstellen"
 
@@ -739,7 +739,7 @@ msgid "rainbow 3"
 msgstr "Regenbogen 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -770,13 +770,13 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "ignorieren"
 
@@ -884,7 +884,7 @@ msgstr "Ziel Gilde:"
 #: 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 "Attackier-Verzögerung:"
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:351
@@ -916,27 +916,27 @@ msgstr "Eingehend: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Ausgehend: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Wusstest du schon?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Zurück"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Vor >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
-msgstr ""
+msgstr "Öffne dieses Fenster automatisch"
 
 #: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
@@ -946,11 +946,11 @@ msgstr "Ok"
 
 #: src/gui/editserverdialog.cpp:54
 msgid "Edit Server"
-msgstr ""
+msgstr "Bearbeite Server"
 
 #: src/gui/editserverdialog.cpp:62
 msgid "Address:"
-msgstr ""
+msgstr "Adresse:"
 
 #: src/gui/editserverdialog.cpp:63
 msgid "Port:"
@@ -962,11 +962,11 @@ msgstr "Server Typ:"
 
 #: src/gui/editserverdialog.cpp:65
 msgid "Description:"
-msgstr ""
+msgstr "Beschreibung:"
 
 #: src/gui/editserverdialog.cpp:175
 msgid "Please at least type both the address and the port of the server."
-msgstr ""
+msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
@@ -974,12 +974,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Hilfe"
 
@@ -1017,31 +1017,31 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Benutzen"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Aufteilen"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Ausrüstung"
 
@@ -1050,17 +1050,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Aufbewahren"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Wegwerfen"
@@ -1202,43 +1202,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr "Du hast die Guilde verlassen."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "automatisch schließen"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "überspringen"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Updateserver verwalten"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Benutzername merken"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
@@ -1256,7 +1256,7 @@ msgstr "Erfahrungs Balken"
 
 #: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
-msgstr ""
+msgstr "Job Balken"
 
 #: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
@@ -1284,7 +1284,7 @@ msgstr "Muss"
 
 #: src/gui/npcdialog.cpp:52
 msgid "Stop waiting"
-msgstr ""
+msgstr "Stoppe Warten"
 
 #: src/gui/npcdialog.cpp:53
 msgid "Next"
@@ -1299,7 +1299,7 @@ msgstr "Absenden"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Frei"
 
@@ -1334,355 +1334,355 @@ msgstr "Zuerst ausziehen"
 msgid "Away outfit"
 msgstr "Abwesend-Outfit"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Heilen"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Befreunden"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
-msgstr ""
+msgstr "Ignorieren"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Schwarze Liste"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Löschen"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
-#: 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Folgen"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imitation"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Lade ein zu Party"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Aus Party werfen"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
-msgstr ""
+msgstr "Rang in Gilde ändern"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Spieler rauswerfen"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
-msgstr ""
+msgstr "Atombombe"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr "Zeige Items"
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Ausziehen"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Kaufen(?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Verkaufen(?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Rauswerfen"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Entferne aus Angriffsliste"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Hinzufügen zur Angriffsliste"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Hinzufügen zur Ignorierenliste"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Aufheben"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Karteneinstellung"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Entfernen"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Warp"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Zaubersprüche"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Lade alte Zaubersprüche"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Bearbeite Zauberspruch"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
-msgstr ""
+msgstr "Lösche den Namen nicht"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Lösche Name"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Aktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Deaktiviere abwesend"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Verlassen"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Kopiere in die Zwischenablage"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Name:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Spieler Kommentar "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Kommentar: "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Die hälfte zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Allles zum Handeln hinzufügen"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Die Hälfte aufbewahren"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Alles fallenlassen"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Die Hälfte abholen"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Lade alte Tastenkombinationen für Objekte"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Lade alte Tastenkombinationen zum fallen Lassen"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Verstecken"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Zeigen"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(normal)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Nach oben"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Nach unten"
 
@@ -1866,7 +1866,7 @@ msgstr "Limitiere max Zeilen im Chat"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #: src/gui/setup_chat.cpp:81
 msgid "Enable chat Log"
@@ -1886,7 +1886,7 @@ msgstr "Verstecke Laden-Mitteilungen"
 
 #: src/gui/setup_chat.cpp:94
 msgid "Tabs"
-msgstr ""
+msgstr "Tabs"
 
 #: src/gui/setup_chat.cpp:96
 msgid "Put all whispers in tabs"
@@ -1914,7 +1914,7 @@ msgstr "Zeige Kampf-Ereignisse"
 
 #: src/gui/setup_chat.cpp:114
 msgid "Resize chat tabs if need"
-msgstr ""
+msgstr "Größe der Chat-Tabs anpassen"
 
 #: src/gui/setup_chat.cpp:118
 msgid "Time"
@@ -1930,7 +1930,7 @@ msgstr "Sonstig"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Highlight words (separated by comma)"
-msgstr ""
+msgstr "Wörter hervorheben (welche mit Komma getrennt sind)"
 
 #: src/gui/setup_chat.cpp:128
 msgid "Show MVP messages"
@@ -2065,7 +2065,7 @@ msgstr "HP-Balken von Monster anzeigen"
 
 #: src/gui/setup_other.cpp:60
 msgid "Cycle monster targets"
-msgstr "Angriffsziele der Monster einkreisen"
+msgstr "Durch die Angriffsziele wechseln"
 
 #: src/gui/setup_other.cpp:66
 msgid "Show warps particles"
@@ -2109,7 +2109,7 @@ msgstr ""
 
 #: src/gui/setup_other.cpp:97
 msgid "Moving"
-msgstr ""
+msgstr "Bewegt sich"
 
 #: src/gui/setup_other.cpp:99
 msgid "Auto fix position"
@@ -2161,7 +2161,7 @@ msgstr "Zeige Job"
 
 #: src/gui/setup_other.cpp:135
 msgid "Enable attack filter"
-msgstr ""
+msgstr "Aktiviere Attackenfilter"
 
 #: src/gui/setup_other.cpp:138
 msgid "Enable advert protocol"
@@ -2189,7 +2189,7 @@ msgstr "Aktiviere auction bot unterstützung"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
+msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
 #: src/gui/setup_other.cpp:168
 msgid "Enable server side attack"
@@ -2225,7 +2225,7 @@ msgstr "Bessere Leistung (aktiviere für bessere Leistung)"
 
 #: src/gui/setup_perfomance.cpp:58
 msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Performance autom. anpassen"
 
 #: src/gui/setup_perfomance.cpp:61
 msgid "Hw acceleration"
@@ -2249,7 +2249,7 @@ msgstr ""
 
 #: src/gui/setup_perfomance.cpp:77
 msgid "Show beings transparency"
-msgstr ""
+msgstr "Zeige die Transperenz von Entitäten"
 
 #: src/gui/setup_perfomance.cpp:80
 msgid "Enable reorder sprites."
@@ -2357,7 +2357,7 @@ msgstr "Alt"
 
 #: src/gui/setup_relations.cpp:249
 msgid "Relations"
-msgstr ""
+msgstr "Beziehungen"
 
 #: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
@@ -2568,11 +2568,11 @@ msgstr "als Partikeleffekt"
 
 #: src/gui/setup_video.cpp:301
 msgid "Enable resize"
-msgstr ""
+msgstr "Erlaube Größenanpassung"
 
 #: src/gui/setup_video.cpp:302
 msgid "No frame"
-msgstr ""
+msgstr "Kein Fensterrahmen"
 
 #: src/gui/setup_video.cpp:306
 msgid "FPS limit:"
@@ -2685,7 +2685,7 @@ msgstr "Zeige Links in Ankündigung"
 
 #: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
-msgstr ""
+msgstr "Auktion"
 
 #: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
@@ -2710,6 +2710,14 @@ msgstr "Erhöhen"
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2720,6 +2728,11 @@ msgstr "Fähigkeiten Tab %d"
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2730,204 +2743,204 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gilde"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s einladen."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s Ausstieg angefragt,"
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Lade Mitglied in die Gilde ein."
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Guilde verlassen?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s zur Party einladen."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Partie %s Auflösung beauftragt."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Lade Mitglied in die Party ein."
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wenn willst du zur Party %s einladen?"
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Partie verlassen?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, 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:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Ignoriere Monster"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Party erstellen"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Sozial"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
-msgstr ""
+msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
-msgstr ""
+msgstr "F"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Guildeneinladung von %s angenommen."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Guildeneinladung von %s abgelehnt."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Party \"%s\""
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Gildenname"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, es wurde schoneinmal angefragt."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Party %s eingeladen."
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Partyname"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Name deiner Party wählen."
 
@@ -3119,33 +3132,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1 Du versuchts es später erneut."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Fertig"
 
@@ -3259,11 +3272,11 @@ msgstr "Portal hervorheben"
 
 #: src/gui/userpalette.cpp:151
 msgid "Default collision Highlight"
-msgstr ""
+msgstr "Hervorhebung von normalen Kollisionen"
 
 #: src/gui/userpalette.cpp:153
 msgid "Air collision Highlight"
-msgstr ""
+msgstr "Hervorhebung von Flug-Kollisionen"
 
 #: src/gui/userpalette.cpp:155
 msgid "Water collision Highlight"
@@ -3437,7 +3450,7 @@ 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."
-msgstr ""
+msgstr "Dieser Kommando wirft einen Spieler aus der Gilde."
 
 #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
 #: src/net/ea/gui/partytab.cpp:69
@@ -3454,7 +3467,7 @@ msgstr "/leave > Verlasse dir Gilde in der du bist"
 
 #: 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 > Jemanden aus deiner Gilde werfen"
 
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
@@ -3565,7 +3578,7 @@ msgstr "WW"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "WS"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
@@ -3593,11 +3606,11 @@ msgstr "Lager"
 
 #: src/inventory.cpp:253
 msgid "Cart"
-msgstr ""
+msgstr "Einkaufswagen"
 
 #: src/keyboardconfig.cpp:43
 msgid "Basic Keys"
-msgstr ""
+msgstr "Normale Tasten"
 
 #: src/keyboardconfig.cpp:44
 msgid "Move Up"
@@ -3645,7 +3658,7 @@ msgstr "Angriff abbrechen"
 
 #: src/keyboardconfig.cpp:65
 msgid "Untarget"
-msgstr ""
+msgstr "Deselektieren"
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
@@ -3665,7 +3678,7 @@ msgstr "Aufheben"
 
 #: src/keyboardconfig.cpp:72
 msgid "Change Pickup Type"
-msgstr ""
+msgstr "Verändere den Aufnahme-Typ"
 
 #: src/keyboardconfig.cpp:74
 msgid "Hide Windows"
@@ -3693,11 +3706,11 @@ msgstr "OK auswählen"
 
 #: src/keyboardconfig.cpp:85
 msgid "Shortcuts Keys"
-msgstr ""
+msgstr "Tastenkürzel"
 
 #: src/keyboardconfig.cpp:86
 msgid "Item Shortcuts Key"
-msgstr ""
+msgstr "Item-Tastenkürzel"
 
 #: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
@@ -3845,7 +3858,7 @@ msgstr "Gefühlstaste %d"
 
 #: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
-msgstr ""
+msgstr "Outfit Tasten"
 
 #: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
@@ -3937,7 +3950,7 @@ msgstr "Verrückte Bewegungen"
 
 #: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
-msgstr ""
+msgstr "Verändere den verrückte Bewegungen-Modus"
 
 #: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
@@ -3969,7 +3982,7 @@ msgstr "Wechsle magische Angriff"
 
 #: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Wechsle PVP Attacke"
 
 #: src/keyboardconfig.cpp:338
 msgid "Change move type"
@@ -3977,7 +3990,7 @@ msgstr "Wechsle die Bewegungsart"
 
 #: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
-msgstr ""
+msgstr "Verändere die Angriffswaffe"
 
 #: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
@@ -4005,7 +4018,7 @@ msgstr "Aktiviere/Deaktiviere abwesend Modus"
 
 #: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
-msgstr ""
+msgstr "Emuliere Rechts-Klick mit der Tastatur"
 
 #: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
@@ -4024,430 +4037,438 @@ msgstr ""
 "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
 "das Spiel lässt sich nicht richtig steuern."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "Inventar ist voll"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß"
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem"
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben."
 msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) normale Bewegungen"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) bewegungen umkehren"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) bewegt sich etwas verrückt"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) bewegt sich verrückt"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
-msgstr ""
+msgstr "(d) normal + verrückt Bewegen"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) unbekannte Bewegung"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) verrückte Bewegung"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) bewegt sich normal zum Ziel"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(0) bewegt sich zum Ziel in Distanz 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) bewegt sich zum Ziel in Distanz 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) bewegt sich zum Ziel in Distanz 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) bewegt sich zum Ziel in Distanz 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) bewegt sich zum Ziel in Distanz 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) bewegt sich zum Ziel in Reichweite"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) Bogenschützen Angriffsreichweite"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) bewegt sich zu jedem Ziel"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) normales Folgen"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) relatives Folgen"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) gespiegeltes Folgen"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) hinterher Folgen"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) unbekannter Folge-Modus"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) wechsel das Attackenlayout ohne Schild"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) wechsel das Attackenlayout mit Schild"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) gehe und greife an"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) gehe, greife an, hebe auf"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) ohne automatischen Angriff"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) kleine aufhebe Zelle 1x1"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) normale aufhebe Zelle 2x1"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) 2x3 Kästchen nach vorne aufheben"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) 3x3 Kästchen aufheben"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) bis Distanz 4 gehen und aufheben"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) bis Distanz 8 gehen und aufheben"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) bis zur maximalen Distanz aufheben"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) aufheben"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) Normale Kartenansicht"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) Debug Kartenansicht"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) Ultra Kartenansicht"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) Ultra Kartenansicht 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) Leere Kartenansicht"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) Schwarz-Weiß Kartenansicht"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) benutze #flar als magischen Angriff"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) benutze #chiza als magischen Angriff"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) benutze #ingrav als magischen Angriff"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) benutze #frillyar als magischen Angriff"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) benutze #upmarmu als magischen Angriff"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) magischer Angriff"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) greife alle Spieler an"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) greife schlechte Beziehungen an"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) greife keine Spieler an"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) PVP Attacke"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) normale Imitation"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) Outfit Imitation"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) spielerverfolgende Kamera"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) freie Kamera"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Du siehst"
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l --log-file : Log Datei benutzen"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Verzeichnis für die Chat Log"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  - --help : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : zu benutzendes Einstellungsverueichniss"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port des Loginservers"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Benutzt diesen Aktualisierungs Host"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Verzeichnis um Bildschirmfotos zu speichern"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "--safemode : Starte das Spiel im sicheren Modus"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "--no-opengl : Deaktiviere OpenGL für diese Sitzung"
 
@@ -4490,6 +4511,7 @@ msgstr "Glück:"
 #: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
+"Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
@@ -4502,22 +4524,24 @@ msgstr "Unbekannter char-server Fehler"
 #: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
+"Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wurde der Name "
+"schon genommen."
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Falscher Name."
 
 #: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
-msgstr ""
+msgstr "Falsche Stats."
 
 #: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
-msgstr ""
+msgstr "Falsche Haare."
 
 #: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
-msgstr ""
+msgstr "Falscher Slot."
 
 #: src/net/ea/charserverhandler.cpp:167
 msgid "Incorrect race."
@@ -4540,7 +4564,7 @@ msgstr "Konnte Character nicht löschen."
 #: 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 "Kanäle sind nicht unterstützt!"
 
 #: src/net/ea/chathandler.cpp:129
 #, c-format
@@ -4550,7 +4574,7 @@ msgstr "Flüstern konnte nicht gesendet werden, %s ist nicht online."
 #: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
+msgstr "Konnte nicht flüstern. Ignoriert von %s."
 
 #: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
@@ -4587,7 +4611,7 @@ msgstr "Spiel"
 
 #: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
-msgstr ""
+msgstr "Verlassen verweigert!"
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
 msgid "Guild created."
@@ -4599,11 +4623,11 @@ msgstr "Du bist bereits in der Gilde"
 
 #: src/net/ea/guildhandler.cpp:98
 msgid "Emperium check failed."
-msgstr ""
+msgstr "Erstellung der Gilde fehlgeschlagen."
 
 #: src/net/ea/guildhandler.cpp:103
 msgid "Unknown server response."
-msgstr ""
+msgstr "Unbekannte Antwort des Servers."
 
 #: src/net/ea/guildhandler.cpp:180
 #, c-format
@@ -4628,27 +4652,27 @@ msgstr "Mitglieder Online: %d"
 #: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
-msgstr ""
+msgstr "Max Mitglieder: %d"
 
 #: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
-msgstr ""
+msgstr "Durchschn. Level: %d"
 
 #: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
-msgstr ""
+msgstr "Gilden-EP: %d"
 
 #: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
-msgstr ""
+msgstr "Verbl. Gilden-EP: %d"
 
 #: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
-msgstr ""
+msgstr "Gildenburg: %s"
 
 #: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
@@ -4656,11 +4680,11 @@ msgstr "Kann Spieler nicht in die Gilde einladen."
 
 #: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "Spieler hat die Gildeneinladung abgelehnt."
 
 #: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "Spieler ist nun in deiner Gilde."
 
 #: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
@@ -4668,7 +4692,7 @@ msgstr "Deine Guilde ist voll."
 
 #: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
-msgstr ""
+msgstr "Unbekannte Antwort auf Gildeneinladung."
 
 #: src/net/ea/guildhandler.cpp:464
 #, c-format
@@ -4698,19 +4722,19 @@ msgstr "/kick > werfen jemanden aus deiner Gilde raus"
 
 #: src/net/ea/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
-msgstr ""
+msgstr "/item > Zeige/ändere Party Item Einstellungen"
 
 #: src/net/ea/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
-msgstr ""
+msgstr "/exp > Zeige/ändere Party EP Einstellungen"
 
 #: src/net/ea/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
-msgstr ""
+msgstr "Dieser Kommando läd <nick> in deine Party ein."
 
 #: src/net/ea/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
-msgstr ""
+msgstr "Dieser Kommando wirft einen Spieler aus der Party."
 
 #: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
@@ -4718,13 +4742,15 @@ msgstr "Befehl: /item <Regel>"
 
 #: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
-msgstr ""
+msgstr "Dieser Kommando ändert die Item Einstellungen"
 
 #: 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 ""
+"<policy> kann \"1\", \"yes\", \"true\" zum aktivieren von Item-Sharing, oder "
+"\"0\", \"no\", \"false\" sein, um es zu deaktivieren."
 
 #: src/net/ea/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4732,21 +4758,23 @@ msgstr "Befehl: /item"
 
 #: src/net/ea/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr ""
+msgstr "Dieser Kommando zeigt die derzeitigen Item Einstellungen der Party."
 
 #: src/net/ea/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
-msgstr ""
+msgstr "Kommando: /exp <policy>"
 
 #: src/net/ea/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
+msgstr "Dieser Kommando verändert die EP Einstellungen der Party."
 
 #: 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 ""
+"<policy> kann \"1\", \"yes\", \"true\" zum aktivieren von EP-Sharing, oder "
+"\"0\", \"no\", \"false\" sein, um es zu deaktivieren."
 
 #: src/net/ea/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -4754,23 +4782,23 @@ msgstr "Befehl:/exp"
 
 #: src/net/ea/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
-msgstr ""
+msgstr "Dieser Kommando zeigt die derzeitigen EP Einstellungen."
 
 #: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
 msgid "Item sharing enabled."
-msgstr ""
+msgstr "Item-Sharing aktiviert."
 
 #: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
 msgid "Item sharing disabled."
-msgstr ""
+msgstr "Item-Sharing deaktiviert."
 
 #: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
 msgid "Item sharing not possible."
-msgstr ""
+msgstr "Item-Sharing ist nicht möglich."
 
 #: src/net/ea/gui/partytab.cpp:157
 msgid "Item sharing unknown."
-msgstr ""
+msgstr "Item-Sharing unbekannt."
 
 #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
@@ -4796,72 +4824,74 @@ msgstr "Kann diesen Gegenstand nicht verwenden."
 msgid "Unable to equip."
 msgstr "Kann nicht Ausrüsten."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Altes Passwort fehlerhaft"
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "Unbekannte ID"
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "Account abgelaufen."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
-msgstr ""
+msgstr "Vom Server abgelehnt."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
+msgstr "Du wurdest für immer gebannt. Bitte kontaktiere das GM-Team."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Client zu alt"
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
+"Du wurdest bis %s gebannt.\n"
+"Bitte kontaktiere das GM-Team via der Foren."
 
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Server ist voll."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Dieser Benutzername ist bereits in Verwendung"
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
-msgstr ""
+msgstr "Benutzername für Immer gelöscht."
 
 #: src/net/ea/partyhandler.cpp:80
 msgid "Could not create party."
-msgstr ""
+msgstr "Konnte Party nicht erstellen."
 
 #: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
@@ -4880,7 +4910,7 @@ msgstr "%s is bereits ein Mitglied deiner Party."
 #: src/net/ea/partyhandler.cpp:179
 #, c-format
 msgid "%s refused your invitation."
-msgstr ""
+msgstr "%s hat die Einladung abgelehnt."
 
 #: src/net/ea/partyhandler.cpp:184
 #, c-format
@@ -4890,12 +4920,12 @@ msgstr "%s ist nun ein Mitglied deiner Party"
 #: src/net/ea/partyhandler.cpp:189
 #, c-format
 msgid "%s can't join your party because party is full."
-msgstr ""
+msgstr "%s kann deiner Party nicht beitreten. Sie ist voll."
 
 #: src/net/ea/partyhandler.cpp:194
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr ""
+msgstr "QQQ Unbekannte Antwort auf die Einladung für %s."
 
 #: src/net/ea/partyhandler.cpp:358
 msgid "You have left the party."
@@ -4989,7 +5019,7 @@ msgstr "Du bit tot."
 
 #: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Du bist nicht mehr..."
 
 #: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
@@ -5020,12 +5050,14 @@ msgstr "Du bist weg vom Fenster."
 #: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
 msgstr ""
+"Du schaust dir die Gänseblümchen\n"
+"gerade von unten an."
 
 #: 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 "\"Übung macht den Meister\", meint das Monster."
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
@@ -5050,6 +5082,7 @@ msgstr ""
 #: src/net/ea/playerhandler.cpp:346
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
+"Du trägst weniger als die hälfte des Gewichts. Du kannst dich regenerieren."
 
 #: src/net/ea/playerhandler.cpp:453
 #, c-format
@@ -5059,7 +5092,7 @@ msgstr "Du hast %s aufgehoben."
 #: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
-msgstr ""
+msgstr "Du bezahltest %s."
 
 #: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
@@ -5091,7 +5124,7 @@ msgstr "Konnte Party nicht beitreten!"
 
 #: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Du kannst nicht schreien!"
 
 #: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
@@ -5099,11 +5132,11 @@ msgstr "Du hast noch ein zu niedriges Level!"
 
 #: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Unausreichende HP!"
 
 #: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "Unausreichende SP!"
 
 #: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
@@ -5143,11 +5176,11 @@ msgstr "Warp fehlgeschlagen..."
 
 #: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Konnte nichts stehlen..."
 
 #: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
-msgstr ""
+msgstr "Gift hatte kein Effekt..."
 
 #: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
@@ -5178,11 +5211,11 @@ msgstr "Handel mit %s abgebrochen"
 
 #: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
-msgstr ""
+msgstr "Unbehandeltes Handel-Fehlschlags-Paket."
 
 #: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+msgstr "Fehlschlag: Der Handelspartner kann nichts mehr Tragen."
 
 #: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
@@ -5511,7 +5544,7 @@ msgstr "Verkauf fehlgeschlagen."
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "Handeln fehlgeschlagen."
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
@@ -5616,7 +5649,7 @@ msgstr "Angriffs Verzögerung"
 
 #: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
-msgstr ""
+msgstr "Lauf-Verzögerung:"
 
 #: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
diff --git a/po/es.po b/po/es.po
index 63a36ccf4..cdbb59b52 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-02 19:32+0000\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:20+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
@@ -45,47 +45,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,50 +95,50 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -392,20 +392,20 @@ msgstr "Bot Checker"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Hablar"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Mover"
 
@@ -418,8 +418,8 @@ msgid "Reset"
 msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Comprar"
 
@@ -467,8 +467,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Tienda"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -478,18 +478,18 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -525,7 +525,7 @@ msgstr "Los correos ingresados no concuerdan."
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Contraseña:"
@@ -557,7 +557,7 @@ msgid "New Character"
 msgstr "Nuevo Personaje"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -593,7 +593,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Crear"
 
@@ -736,7 +736,7 @@ msgid "rainbow 3"
 msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -767,13 +767,13 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -913,25 +913,25 @@ msgstr "Recibiendo: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "¿Sabías que...?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Previo"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Siguiente >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
@@ -972,12 +972,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Quitárselo"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1015,31 +1015,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Tirar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Conjuntos"
 
@@ -1048,17 +1048,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Almacenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Recuperar"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Tirar"
@@ -1200,43 +1200,43 @@ msgstr "jacko apareciendo"
 msgid "You have left the guild."
 msgstr "Has dejado el clan."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Cerrar automáticamente"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Saltar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Actualizar:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
@@ -1297,7 +1297,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -1332,355 +1332,355 @@ msgstr "Quitárselo antes"
 msgid "Away outfit"
 msgstr "Conjunto para modo AFK"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Intercambio"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Sanar"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Desatender"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Lista negra"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Borrar"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imitación"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Invitar a grupo"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Sacar del grupo"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Sacar del clan"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el clan"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Invitar al clan"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Sacar jugador"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Eliminar"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Desvestir"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Agregar comentario"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Sacar"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritaria"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Recoger"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Deformar"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Hechizos"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Cargar hechizos antiguos"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Remover nombre"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Dejar"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Cambiar posición del Clan"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nombre:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Comentario del jugador            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Comentario:                      "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Almacenar 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Almacenar todo"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Tirar todo"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Cargar atajos antiguos de artículos"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Cargar atajos para tirar antiguos"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(predeterminado)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Subir"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2703,6 +2703,14 @@ msgstr "Incrementar"
 msgid "Skill points available: %d"
 msgstr "Puntos de habilidades: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr "básico"
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr "Habilidad: básico, Id: 1"
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2713,6 +2721,11 @@ msgstr "Habilidades %d"
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr "Habilidad: %s, Id: %d"
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2723,204 +2736,204 @@ msgstr "Nivel: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Clan"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invita al jugador %s al clan %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Clan %s pidiendo salir."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Miembro invitado al clan."
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "¿Dejar el clan?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grupo %s requisitado."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, 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:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, 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:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Navegación"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Crear Clan"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Crear grupo"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al clan de  %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al clan de %s."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu clan."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, 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:1603
+#: src/gui/socialwindow.cpp:1604
 #, 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:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
@@ -3112,33 +3125,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 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:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  lo intentes de nuevo más tarde."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Completado"
 
@@ -4014,431 +4027,439 @@ msgstr ""
 "Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Recogiste un %d [@@%d|%s@@]."
 msgstr[1] "Recogiste unos %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr "xp"
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr "trabajo"
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimiento loco número %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) atacar a los que no son amigos"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr "(f) atacar a todos, excepto a amigos"
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) no atacar a los jugadores"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Imitación: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Ves "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opciones] [manaplus-file]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 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:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "              usado para establecer parámetros personalizados."
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "              al cliente manaplus."
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Archivo de registro a usar"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 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:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Muestra la versión"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Muestra la ayuda"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Acceder con este nombre de usuario"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Acceder con la contraseña"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Acceder con este jugador"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Login server o IP"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Puerto del servidor"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usar este host de actualización"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Saltarse las actualizaciones"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Iniciar el juego en modo seguro"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Comenzar a probar controladores y auto configurar"
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
@@ -4496,7 +4517,7 @@ msgstr "Falla char-server desconocida."
 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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
@@ -4799,53 +4820,53 @@ msgstr "Fallo al usar el artículo."
 msgid "Unable to equip."
 msgstr "Imposible equipar."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Contraseña antigua incorrecta."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Has sido proscrito permanentemente del juego. Por favor contacta con el "
 "equipo de GM."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Cliente es demasiado antiguo."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4854,15 +4875,15 @@ msgstr ""
 "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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
diff --git a/po/fi.po b/po/fi.po
index c015ef94e..c09731088 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -41,47 +41,47 @@ msgstr "P"
 msgid "I"
 msgstr "-"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Tehokkuus"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -91,50 +91,50 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -320,43 +320,43 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -389,20 +389,20 @@ msgstr "Bottitutka"
 msgid "Name"
 msgstr "Nimi"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Hyökkää"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Keskustele"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Liiku"
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Nollaa"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Osta"
 
@@ -464,8 +464,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -475,18 +475,18 @@ msgstr "Myy"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Peru"
 
@@ -522,7 +522,7 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Salasana:"
@@ -554,7 +554,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -590,7 +590,7 @@ msgid "Race:"
 msgstr "Rotu: "
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Luo"
 
@@ -733,7 +733,7 @@ msgid "rainbow 3"
 msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -764,13 +764,13 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -910,25 +910,25 @@ msgstr "Sisään: %d tavua/s"
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Tiesitkö?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Edellinen"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Seuraava >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Avaa tämä ikkuna automaattisesti"
 
@@ -968,12 +968,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Apua"
 
@@ -1011,31 +1011,31 @@ msgid "Filter:"
 msgstr "Suodin:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 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:1818
-#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -1044,17 +1044,17 @@ msgid "Weight:"
 msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Varastoi"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Ota"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Pudota"
@@ -1196,43 +1196,43 @@ msgstr "jacko elää!"
 msgid "You have left the guild."
 msgstr "Olet eronnut killasta."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Oletus"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Sulje kun valmis"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Ohita"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Käytä omaa päivityspalvelinta"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Päivitys:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
@@ -1293,7 +1293,7 @@ msgstr "Lähetä"
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1328,355 +1328,355 @@ msgstr "Riisu ensin"
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tee kaupat"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Paranna"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Ystävysty"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Vaimenna"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Musta lista"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Pyyhi"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Seuraa"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Matki"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Potki pelaaja"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Pommita"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Riisu"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Potki"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Poimi"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Karttaolio"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Poista"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Warppaa"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Poista asu"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Loitsut"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Lataa vanhat loitsut"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Poista nimi"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Eroa"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Varastoi 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Varastoi puolet"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Lataa vanhat tavarapikavalinnat"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Lataa vanhat pudotuspikavalinnat"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Piilota"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Näytä"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(oletus)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Siirrä ylös"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2698,6 +2698,14 @@ msgstr "Ylös"
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2708,6 +2716,11 @@ msgstr "Taitojoukko %d"
 msgid "Skill %d"
 msgstr "Taito %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2718,204 +2731,204 @@ msgstr "Taso: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Kilta"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Killasta %s eroa pyydetty."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Jäsenen kutsuminen kiltaan"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Eroa killasta?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Ryhmä"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Hyö"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Luo kilta"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, 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:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -3105,33 +3118,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Pelaa"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Valmis"
 
@@ -4008,431 +4021,439 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, 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) poimittu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) villiliike nro %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) säästä ystävät, listi muut"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) älä hyökkää pelaajien kimppuun"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Näet "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [asetukset] [manaplus-tiedosto]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "                  jolla asetetaan erikoisvalitsimia"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "                  manaplus-ohjelmalle."
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Asetusvivut:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Käytettävä lokitiedosto"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Käytettävä keskustelulokihakemisto"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Näytä versionumero"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Näytä tämä ohje"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Ohita päivityslataukset"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
@@ -4488,7 +4509,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
@@ -4786,52 +4807,52 @@ msgstr "Tavaran käyttö ei onnistunut."
 msgid "Unable to equip."
 msgstr "Käyttöönotto ei onnistunut."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Vanha salsana on väärä."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "Rekisteröimätön tunniste."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Väärä salasana."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "Tili vanhentunut."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 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:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Liian vanha asiakasohjelma."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4840,15 +4861,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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Palvelin on täynnä."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Käyttäjätunnus on jo käytössä."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
diff --git a/po/fr.po b/po/fr.po
index c6a4d63a1..c25cc010e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-04 00:11+0000\n"
-"Last-Translator: reid <reidyaro@gmail.com>\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+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"
@@ -46,47 +46,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -96,50 +96,50 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -326,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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 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:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -396,20 +396,20 @@ msgstr "Testeur de Robot"
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Parler"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Déplacement"
 
@@ -422,8 +422,8 @@ msgid "Reset"
 msgstr "Réinitialiser"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Acheter"
 
@@ -471,8 +471,8 @@ msgstr "Max."
 msgid "Shop"
 msgstr "Boutique"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -482,18 +482,18 @@ msgstr "Vendre"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -529,7 +529,7 @@ msgstr "Les deux adresses e-mail ne correspondent pas."
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -561,7 +561,7 @@ msgid "New Character"
 msgstr "Nouveau Personnage"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nom :"
 
@@ -597,7 +597,7 @@ msgid "Race:"
 msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Créer"
 
@@ -740,7 +740,7 @@ msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -771,13 +771,13 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -917,25 +917,25 @@ msgstr "Entrée : %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Le saviez-vous ?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Précédent"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Suivant >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
@@ -975,12 +975,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Retirer"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Aide"
 
@@ -1018,31 +1018,31 @@ msgid "Filter:"
 msgstr "Filtre :"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Utiliser"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Jeter..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Partager"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -1051,17 +1051,17 @@ msgid "Weight:"
 msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Entreposer"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Récupérer"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Jeter"
@@ -1203,43 +1203,43 @@ msgstr "Arrivée de Jack0"
 msgid "You have left the guild."
 msgstr "vous avez quitté la guilde."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Fermeture automatique"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Sauter"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Compte"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Serveur de mise à jour personnalisé"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Mise à jour : "
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
@@ -1300,7 +1300,7 @@ msgstr "Soumettre"
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Effacer"
 
@@ -1335,355 +1335,355 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Message"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Soigner"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Être ami"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Éviter"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Liste noir"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Éliminer"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Suivre"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imiter"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Sortir du groupe"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Sortir de la guilde"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Sortir le joueur"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Annihiler"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Déshabiller"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Virer"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Objet de carte"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Télétransportation"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Nettoyer les tenues"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Sortilèges"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Charger les anciens sorts"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Éditer le sortilège"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Enlève le nom"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 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:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nom : "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Le joueur commente            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Commentaire :                      "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Entreposer 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Entreposer tout"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Jeter tout"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Charger les anciens raccourcis d'objets"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Charger les anciens raccourcis de jets d'objets"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Cacher"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Montrer"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(défaut)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Aller vers le haut"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2712,6 +2712,14 @@ msgstr "Augmenter"
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2722,6 +2730,11 @@ msgstr "Compétence choisie : %d"
 msgid "Skill %d"
 msgstr "Compétence %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2732,208 +2745,208 @@ msgstr "Niveau : %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilde"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Demande pour quitter la guilde %s effectuée."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Inviter le membre de la guilde"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Quitter la guilde ?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groupe"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Vous avez demandé à quitter le groupe %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, 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:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, 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:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Créer un groupe"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr "F"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Choisissez le nom de la guilde."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 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:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 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:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, 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:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Choisissez le nom du groupe."
 
@@ -3125,33 +3138,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nom : %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 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:572
+#: src/gui/updaterwindow.cpp:573
 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:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Terminé"
 
@@ -4031,439 +4044,447 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "Tu as été tué par %s"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, 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:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnue"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) mouvement de fou numerique %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) Portée des attaques des Archéens"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) attaque tous les joueurs"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) n'attaque pas des amis"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Vous voyez  "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 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:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "utilisé pour définir des paramètres personnalisés"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "pour le client manaplus."
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : fichier journal à utiliser"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 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:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette rubrique d'aide"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr ""
 "     --update-host : Utilise cette URL pour les fichiers de mises à jour"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 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:70
+#: src/main.cpp:71
 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:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Répertoire des données du jeu à charger"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 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:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Démarrer le jeu en mode sûr"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 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
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
@@ -4521,7 +4542,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
@@ -4823,53 +4844,53 @@ msgstr "Impossible d'utiliser l'objet."
 msgid "Unable to equip."
 msgstr "Impossible d'équiper cet objet."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Ancien mot de passe incorrect."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 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:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "Id non enregistrée."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "Le compte a expiré."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Rejeté par le serveur."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 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:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Client trop ancien."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4878,15 +4899,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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Serveur surpeuplé."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
diff --git a/po/id.po b/po/id.po
index a2f435d95..87b86049f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
 "PO-Revision-Date: 2012-02-02 16:45+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -43,47 +43,47 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,50 +93,50 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -385,20 +385,20 @@ msgstr "Pengecek Bot"
 msgid "Name"
 msgstr "Nama"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Pukul"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Berbicara"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Jalan"
 
@@ -411,8 +411,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Beli"
 
@@ -460,8 +460,8 @@ msgstr "Max"
 msgid "Shop"
 msgstr "Toko"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -471,18 +471,18 @@ msgstr "Jual"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Batal"
 
@@ -518,7 +518,7 @@ msgstr "Pengisian alamat email tidak cocok"
 msgid "Change Password"
 msgstr "Ganti sandi"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Kata Sandi:"
@@ -550,7 +550,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nama:"
 
@@ -586,7 +586,7 @@ msgid "Race:"
 msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Buat"
 
@@ -729,7 +729,7 @@ msgid "rainbow 3"
 msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -760,13 +760,13 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -906,25 +906,25 @@ msgstr "Masuk: %d bytes/det"
 msgid "Out: %d bytes/s"
 msgstr "Keluar: %d bytes/det"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Apakah kamu tahu?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "Sebelumnya"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Selanjutnya"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
@@ -964,12 +964,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Lepaskan"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Bantuan"
 
@@ -1007,31 +1007,31 @@ msgid "Filter:"
 msgstr "Penyaring:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Pakai"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Gunakan"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Pecah"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Setelan"
 
@@ -1040,17 +1040,17 @@ msgid "Weight:"
 msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Simpan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Kembalikan"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Buang"
@@ -1190,43 +1190,43 @@ msgstr "Jacko bertelur"
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Tutup otomatis"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "lanjutkan"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Modifikasi sumber update"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Ingat username"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Menganti Server"
 
@@ -1287,7 +1287,7 @@ msgstr "Masukan"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Hapus"
 
@@ -1322,355 +1322,355 @@ msgstr "Copot lebih dahulu"
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Tukar"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Berbisik"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Menyembuhkan"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Jadikan teman"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: 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: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:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
-#: src/gui/popupmenu.cpp:702
-msgid "Set as enemy"
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
 msgstr ""
 
 #: 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:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
 #: 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
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Hapus"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: 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
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Mengikuti"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Tirukan"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "keluarkan  pemain"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Tanggalkan pakaian"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Penambahan komentar"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "keluarkan"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar menyerang"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Tambahkan prioritas daftar menyerang"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Tambahkan ke daftar menyerang"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Tambahkan ke daftar Abaikan"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Pemain"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Ambil ke obrolan"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Daftar barang"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Mantra"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Memuat mantra lama"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Edit mantra"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "hapus nama"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nama:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Komentar pemain"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "komentar"
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Tambahkan semua ke Penukaran"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Masukkan 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Masukkan setengah"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Masukkan semua"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Buang semuanya"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Muat jalan pintas iItem lama"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Muat jalan pintas Buang yang lama"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Sembunyikan"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Tampilkan"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(kembalikan)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Bergerak keatas"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2688,6 +2688,14 @@ msgstr "Naik"
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2698,6 +2706,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr "Skill %d"
 
+#: src/gui/skilldialog.cpp:438
+#, fuzzy, c-format
+msgid "Skill: %s, Id: %d"
+msgstr "Skill %d"
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2708,204 +2721,204 @@ msgstr "Level: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Level: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Organisasi"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Permintaan %s keluar dari Organisasi "
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Tinggalkan organisasi?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Kelompok"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok"
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "serang mob"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3095,33 +3108,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Mengupdate..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Main"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3991,429 +4004,437 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4469,7 +4490,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
@@ -4762,66 +4783,66 @@ msgstr ""
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Versi yang digunakan sudah kadaluarsa."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, 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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Server kepenuhan."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
diff --git a/po/ja.po b/po/ja.po
index 0bee737f8..cb90a39b0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-03 05:16+0000\n"
-"Last-Translator: Candy <HarajukuCupcakes@gmail.com>\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+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"
@@ -45,47 +45,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,50 +95,50 @@ msgstr "ゲームサーバーを変更しています"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
@@ -318,43 +318,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "トレードリクエストを無効にしています"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "マップの読み込みに失敗しました"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sの読み込み中にエラーが起きました"
@@ -387,20 +387,20 @@ msgstr "ボットチェッカー"
 msgid "Name"
 msgstr "名前"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻撃"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "話す"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "動く"
 
@@ -413,8 +413,8 @@ msgid "Reset"
 msgstr "リセット"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "買う"
 
@@ -462,8 +462,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -473,18 +473,18 @@ msgstr "売る"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -520,7 +520,7 @@ msgstr "メールアドレスが一致しません"
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "パスワード:"
@@ -552,7 +552,7 @@ msgid "New Character"
 msgstr "新しいキャラクター"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名前:"
 
@@ -588,7 +588,7 @@ msgid "Race:"
 msgstr "人種:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "作成"
 
@@ -731,7 +731,7 @@ msgid "rainbow 3"
 msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -762,13 +762,13 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "完全無視"
 
@@ -908,25 +908,25 @@ msgstr "入力: %dバイト/秒"
 msgid "Out: %d bytes/s"
 msgstr "出力: %d バイト/秒"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "豆知識"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< 前へ"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "次へ >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "この窓を自動で開ける"
 
@@ -966,12 +966,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "取外す"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -1009,31 +1009,31 @@ msgid "Filter:"
 msgstr "フィルタ:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "装着"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "落とす..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "分割"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "服装"
 
@@ -1042,17 +1042,17 @@ msgid "Weight:"
 msgstr "重量:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "保管"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "取出す"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
@@ -1192,43 +1192,43 @@ msgstr "JackOが出現中"
 msgid "You have left the guild."
 msgstr "ギルドから退会しました"
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "普通"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "自動で閉じる"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "スキップ"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "サーバー:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "ユーザー名を記憶する"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "アップデート:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "登録"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "サーバー変更"
 
@@ -1289,7 +1289,7 @@ msgstr "決定"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "クリア"
 
@@ -1324,355 +1324,355 @@ msgstr "最初に取外す"
 msgid "Away outfit"
 msgstr "AFK中の服装"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交換"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "ささやく"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "HP回復"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "友達になる"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "無視する"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "ブラックリスト"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "消す"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: 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
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "フォロー"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "真似"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "プレイヤーを一時的に追い出す"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "消す"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "コメントをする"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "買う (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "売る (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "追い出す"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "完全無視リストへ追加する"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "プレイヤー"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "拾う"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "チャットに追加"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "マップアイテム"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "名前を変更する"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "削除"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "ワープ"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "古い呪文を読込む"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "名前を削除する"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "退会"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "          マップサインの名前を変更"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "名前:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "プレイヤーコメント            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "コメント:                      "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "トレードに追加"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "トレードに10追加する"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "トレードに半分追加する"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "トレードに全て追加する"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "10 保存"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "半分保存"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "全部保存"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "全て落とす"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "半分取出す"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "全部取出す"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "旧アイテムショートカットを読込む"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "旧ドロップショートカットを読込む"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr " 非表示"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "表示"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(デフォルト)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "上へ移動"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2694,6 +2694,14 @@ msgstr "上"
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2704,6 +2712,11 @@ msgstr "スキルセット %d"
 msgid "Skill %d"
 msgstr "スキル %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2714,204 +2727,204 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "ギルド"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "ユーザー %sを、ギルド %sに招待しました"
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "ギルドへメンバーを招待しました"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "ギルド %sに誰を招待しますか？"
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "ギルドから退会しますか？"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "パーティー"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "パーティ %sへ退会届を出しました"
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "メンバーをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "パーティ %sに誰を招待しますか?"
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "パーティーから退会しますか？"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "ナビ"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "攻撃"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "優先される敵"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "敵を完全無視する"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "ギルドを作成する"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "ソーシャル"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr "フレ"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "ギルド名"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください"
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています"
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました"
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました"
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました"
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "パーティ名"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
@@ -3103,33 +3116,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "名前: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "更新しています..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "プレイ"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください"
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "完了"
 
@@ -4005,432 +4018,440 @@ msgstr ""
 "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
 "ん。"
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません"
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "量が多すぎます"
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです"
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, 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:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) 友達以外を攻撃"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "アウェイ"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイアー"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "フォロー: "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "真似: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr " が見える"
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [オプション] [manaplus-ファイル]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "                  でカスタムパラメーターを設定しました"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "                  をmanaplusクライアントへ設定しました"
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : 使用するログファイル"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : チャットログ場所"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : バージョンを表示"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : ヘルプメニュー表示"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : 使用する設定ファイル"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : この名前でログインする"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : このパスワードでログインする"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : このキャラクターでログインする"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : ログインサーバー又はIP"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : ログインサーバーポート"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : このアップデートホストを利用する"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
 "ターを選択する"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : アップデートをスキップする"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : ゲームデータを読み込む場所"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : ローカルデータディレクトリの場所"
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : スクリーンショットの保存場所"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : セーフモードでゲームを始める"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --openglエラー      : OpenGLを今回のみ無効にする"
 
@@ -4488,7 +4509,7 @@ msgstr ""
 "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
 "れています"
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "名前が違います"
 
@@ -4785,51 +4806,51 @@ msgstr "アイテム使用に失敗"
 msgid "Unable to equip."
 msgstr "装着不可能"
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "アカウントが見つかりませんでした。再度ログインして下さい"
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "変更前のパスワードが間違っています"
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません"
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "未登録なID"
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "入力したパスワードは間違っています"
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "アカウントの有効期限が切れました"
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "サーバーから拒否されました"
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい"
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "アップデートが必要です"
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4838,15 +4859,15 @@ msgstr ""
 "あなたは%sまでゲームから追放されました。\n"
 "GMにご連絡下さい。"
 
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "サーバーが混雑しています"
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "ユーザ名は既に使用されています"
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "ユーザーネームは永久に削除されました"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 27dddd521..ea9e825db 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
+"POT-Creation-Date: 2012-02-06 02:06+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,47 +40,47 @@ msgstr ""
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -90,50 +90,50 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -315,43 +315,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -384,20 +384,20 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr ""
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -410,8 +410,8 @@ msgid "Reset"
 msgstr ""
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
@@ -459,8 +459,8 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -470,18 +470,18 @@ msgstr ""
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -517,7 +517,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -549,7 +549,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
@@ -585,7 +585,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
@@ -728,7 +728,7 @@ msgid "rainbow 3"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -759,13 +759,13 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
@@ -905,25 +905,25 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
@@ -963,12 +963,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
@@ -1006,31 +1006,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
@@ -1039,17 +1039,17 @@ msgid "Weight:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
@@ -1191,43 +1191,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr ""
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr ""
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
@@ -1288,7 +1288,7 @@ msgstr ""
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
@@ -1323,355 +1323,355 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: 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: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:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
-#: src/gui/popupmenu.cpp:702
-msgid "Set as enemy"
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
 msgstr ""
 
 #: 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:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
 #: 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
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: 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
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
@@ -2689,6 +2689,14 @@ msgstr ""
 msgid "Skill points available: %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2699,6 +2707,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2709,204 +2722,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -3096,33 +3109,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3992,430 +4005,438 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4471,7 +4492,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
@@ -4764,66 +4785,66 @@ msgstr ""
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, 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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index b40a90933..b45b9432f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+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"
@@ -42,47 +42,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -92,50 +92,50 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -389,20 +389,20 @@ msgstr "Bot Controleerder"
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Spreken"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Beweeg"
 
@@ -415,8 +415,8 @@ msgid "Reset"
 msgstr "Reset"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kopen"
 
@@ -464,8 +464,8 @@ msgstr "Maximum"
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -475,18 +475,18 @@ msgstr "Verkopen"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -522,7 +522,7 @@ msgstr "De email adres ingaven zijn niet gelijk."
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -554,7 +554,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Naam:"
 
@@ -590,7 +590,7 @@ msgid "Race:"
 msgstr "Ras:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -733,7 +733,7 @@ msgid "rainbow 3"
 msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -764,13 +764,13 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Negeer"
 
@@ -910,25 +910,25 @@ msgstr "Invoer: %d bytes/sec"
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Weet u?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Vorig"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Volgend >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
@@ -968,12 +968,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Help"
 
@@ -1011,31 +1011,31 @@ msgid "Filter:"
 msgstr "Filter:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Gebruiken"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Neerleggen..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Splitsen"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -1044,17 +1044,17 @@ msgid "Weight:"
 msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
@@ -1196,43 +1196,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Auto Sluiten"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Overslaan"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Manuele update server"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Onthoud gebruikersnaam"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Wijzig Server"
 
@@ -1293,7 +1293,7 @@ msgstr "Indienen"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1328,355 +1328,355 @@ msgstr "Verwijder uitrusting eerst"
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Fluister"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Genees"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Word vriend"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
-#: 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: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:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
-#: src/gui/popupmenu.cpp:702
-msgid "Set as enemy"
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
 msgstr ""
 
 #: 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:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
 #: 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
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Wis"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Volg"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imiteer"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Schop speler"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "ontkleed"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Schop"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Raap op"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Verwijder"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spreuken"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Laad oude spreuken"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Verwijder naam"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "away aanzetten"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "away afzetten"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Verlaat"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Plaats 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Plaats de helft"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Plaats alles"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Laden van oude voorwerpsnelkoppelingen"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Laden van oude neerleggingsnelkoppeling"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Verberg"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Toon"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(standaard)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2702,6 +2702,14 @@ msgstr "Omhoog"
 msgid "Skill points available: %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2712,6 +2720,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2722,204 +2735,204 @@ msgstr "Niv: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Niv: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, 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:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, 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:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Aanv"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Sociaal"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Guild Naam"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 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:1595
+#: src/gui/socialwindow.cpp:1596
 #, 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:1603
+#: src/gui/socialwindow.cpp:1604
 #, 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:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Groep Naam"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -3111,33 +3124,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 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:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -4016,430 +4029,438 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, 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:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Opties:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log bestand te gebruiken"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Chat log bestand te gebruiken"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Toon de versie"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Toon deze help"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Login met deze gebruikersnaam"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Loging met dit wachtwoord"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Login met dit karakter"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Login servernaam of IP"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Login serverpoort"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Updateserver te gebruiken"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : update downloads overslaan"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Map om spelgegevens te laden"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 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:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Start spel in veilige modus"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Zet OpenGL af voor deze sessie"
 
@@ -4497,7 +4518,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
@@ -4798,51 +4819,51 @@ msgstr "Kan voorwerp niet gebruiken."
 msgid "Unable to equip."
 msgstr "Kan dit niet uitrusten."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Oud wachtwoord is ongeldig."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Client is te oud."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4851,15 +4872,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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd"
 
diff --git a/po/pl.po b/po/pl.po
index 15fd20cf9..3c40b1082 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
 "pl/)\n"
@@ -43,47 +43,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Obraz"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Skórki"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Logowanie"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,50 +93,50 @@ msgstr "Zmiana serwera"
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -393,20 +393,20 @@ msgstr "Wykrywacz botów"
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atak"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Podejdź"
 
@@ -419,8 +419,8 @@ msgid "Reset"
 msgstr "Resetuj"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kup"
 
@@ -468,8 +468,8 @@ msgstr "Maks."
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -479,18 +479,18 @@ msgstr "Sprzedaj"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -526,7 +526,7 @@ msgstr "Pola adresu e-mail się nie zgadzają."
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Hasło:"
@@ -558,7 +558,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Imię:"
 
@@ -594,7 +594,7 @@ msgid "Race:"
 msgstr "Rasa:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Utwórz"
 
@@ -737,7 +737,7 @@ msgid "rainbow 3"
 msgstr "tęczowy 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -768,13 +768,13 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignoruj"
 
@@ -914,25 +914,25 @@ msgstr "Wejście: %d bajtów"
 msgid "Out: %d bytes/s"
 msgstr "Wyjście: %d bajtów"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Cz wiesz że..."
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Cofnij"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Dalej>"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Otwieraj to okno automatycznie"
 
@@ -972,12 +972,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Pomoc"
 
@@ -1015,31 +1015,31 @@ msgid "Filter:"
 msgstr "Filtr:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Użyj"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Upuść..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Podziel"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Stroje"
 
@@ -1048,17 +1048,17 @@ msgid "Weight:"
 msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Przechowaj"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Pobierz"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Upuść"
@@ -1202,43 +1202,43 @@ msgstr "Jack-O spawnuje się"
 msgid "You have left the guild."
 msgstr "Opuściłeś/aś gildię."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normalna"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Automatyczne zamykanie"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Omiń"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Zaawansowane ustawienia aktualizacji"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Zapamiętaj login"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Aktualizacja:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Zmień serwer"
 
@@ -1299,7 +1299,7 @@ msgstr "Zatwierdź"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -1334,355 +1334,355 @@ msgstr "Najpierw zdejmij"
 msgid "Away outfit"
 msgstr "Strój na afk"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Szept"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Lecz"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Lekceważ"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Czarna lista"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Usuń"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Podążaj"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imituj"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Wyrzuć gracza"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Rozbierz"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Wyrzuć"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Gracze"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Portal"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Usuń"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Teleport"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Zaklęcia"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Przywróć stare zaklęcia"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Usuń imię"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Opuść"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nick:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Komentarz gracza            "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Komentarz:                      "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Przechowaj 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Przechowaj połowę"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Przechowaj wszystko"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Odbierz 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Odbierz połowę"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Odbierz wszystko"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Przywróć stare skróty przedmiotów"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Przywróć stare skróty upuszczania"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Ukryj"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Pokaż"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(domyślne)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "W górę"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "W dół"
 
@@ -2705,6 +2705,14 @@ msgstr "Podwyż"
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2715,6 +2723,11 @@ msgstr "Zestaw umiejętności %d"
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2725,204 +2738,204 @@ msgstr "Poziom: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Poziom: %d(%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Gildia"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Poproszono o wyjście z gildii %s."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kogo chcesz zaprosić do gildii %s?"
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Opuścić gildię?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupa"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "GPS"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Atk"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Utwórz gildię"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Społeczność"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, 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:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -3114,33 +3127,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Imię: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -4012,42 +4025,42 @@ msgstr ""
 "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
 "się problemy."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4055,388 +4068,396 @@ 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:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) szalone ruchy numer %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) atak"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) nie atakuj przyjaciół"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) nie atakuj nikogo"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "AFK"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) AFK"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) stan"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Widzisz "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opcje] [manaplus-file]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "                  używane do wprowadzania własnych parametrów"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "                  do klienta manaplus."
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Używany plik logów"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Używany katalog logów"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Pokaż wersję"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Pokaż tą pomoc"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Katalog konfiguracyjny"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Zaloguj się tym loginem"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Zaloguj się tym hasłem"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Zaloguj się tą postacią"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Nazwa serwera lub IP"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port serwera"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Użyj tego serwera aktualizacji"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Wybierz domyślny serwer i postać"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Omiń aktualizację"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog z danymi gry"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --test          :Rozpocznij test sterowników i autokonfigurację"
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Wyłącz OpenGL w tej sesji"
 
@@ -4492,7 +4513,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Nieprawidłowe imię."
 
@@ -4799,51 +4820,51 @@ msgstr "Nie można użyć przedmiotu."
 msgid "Unable to equip."
 msgstr "Nie można założyć."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Konto nie znalezione. Prosimy się przelogować."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Stare hasło nieprawidłowe."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "Ważność konta wygasła."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Nie przyjęty przez serwer."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 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:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Klient jest zbyt nieaktualny."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4852,15 +4873,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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Serwer jest przeciążony."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Login jest już w użyciu."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
diff --git a/po/pt.po b/po/pt.po
index 017eca473..21ce13a39 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-03 23:57+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+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,47 +43,47 @@ msgstr "A"
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,50 +93,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -229,7 +229,7 @@ msgstr "O jogador não está mais ignorado!"
 
 #: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
-msgstr "Não foi possível deixar de ignorar o jogador!"
+msgstr "Não foi possível deixar de ignorar o jogador(a)!"
 
 #: src/commandhandler.cpp:592
 msgid "blacklisted"
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -390,20 +390,20 @@ msgstr "Analizador de bot"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Mover"
 
@@ -416,8 +416,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Comprar"
 
@@ -465,8 +465,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -476,18 +476,18 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -523,7 +523,7 @@ msgstr "Os emails informados não são iguais."
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Senha:"
@@ -555,7 +555,7 @@ msgid "New Character"
 msgstr "Novo Pesonagem"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
@@ -591,7 +591,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Criar"
 
@@ -734,7 +734,7 @@ msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -765,13 +765,13 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -786,7 +786,7 @@ msgstr "Alvo"
 
 #: src/gui/debugwindow.cpp:74
 msgid "Net"
-msgstr "Teia"
+msgstr "Rede"
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:251
@@ -911,25 +911,25 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Você sabia?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Anterior"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Próximo >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
@@ -969,12 +969,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1012,31 +1012,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -1045,17 +1045,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1197,43 +1197,43 @@ msgstr "JackOvai aparecer"
 msgid "You have left the guild."
 msgstr "Você saiu da Guilda."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Fechar"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1294,7 +1294,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1327,357 +1327,357 @@ msgstr "Desequipar antes"
 
 #: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
-msgstr "Roupas de ocupado"
+msgstr "Roupas em modo ausente"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Sussuro"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Curar:"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Ser Amigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Lista Negra"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Definir como inimigo."
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Apagar"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Deixar pelado"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
-msgstr "Deixar sem Roupas"
+msgstr "Limpar conjunto de roupas"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "A Remover"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Urdidura"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Carregar Antigos Feitiços"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Remover nome"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 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:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Mover a cima"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -1999,7 +1999,7 @@ msgstr "Habilitar joystick"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr "Use joystick se a janela cliente estiver inativo"
+msgstr "Usar joystick se a janela do jogo estiver inativa"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -2091,11 +2091,11 @@ msgstr "Desenhar atalhos no mapa"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr "Habilitar rolagem preguiçosa"
+msgstr "Habilitar rolagem suave"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr "Rolagem preguiçosa"
+msgstr "Rolagem suave"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
@@ -2139,7 +2139,7 @@ msgstr "Alvo de jogadores em ciclo"
 
 #: src/gui/setup_other.cpp:123
 msgid "Show job exp messages"
-msgstr "Mostrar menssagens de job exp"
+msgstr "Mostrar mensagens de job exp"
 
 #: src/gui/setup_other.cpp:126
 msgid "Show players popups"
@@ -2147,7 +2147,7 @@ msgstr "Mostrar popups de jogadores"
 
 #: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr "Mensagem Ausente"
+msgstr "Mensagem em modo Ausente"
 
 #: src/gui/setup_other.cpp:132
 msgid "Show job"
@@ -2179,7 +2179,7 @@ msgstr "Suporte de bots"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr "Habilitar suporte há bot de leilão"
+msgstr "Habilitar suporte ao AuctionBot "
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
@@ -2195,7 +2195,7 @@ msgstr "Habilitar Analisador de bot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr "Habilitar proteção contra bugs no servidor (não pode ser desabilitado)"
+msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2227,7 +2227,7 @@ msgstr "Aceleração por HW"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
-msgstr "Habilitar cache de opacidade (Software, pode usar muita memória)"
+msgstr "Habilitar cache de transparência (Software, pode usar muita memória)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
@@ -2279,7 +2279,7 @@ msgstr "Ativar segmentação prolongada de mouse"
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
-msgstr "Jogadores mortos como alvo"
+msgstr "Jogadores(as) mortos(as) como alvo"
 
 #: src/gui/setup_players.cpp:69
 msgid "Visible names"
@@ -2299,7 +2299,7 @@ msgstr "Ver status"
 
 #: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
-msgstr "Mostrar endereço de ip nas capturas de tela"
+msgstr "Mostrar endereço de IP em Capturas de Tela"
 
 #: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
@@ -2516,11 +2516,11 @@ msgstr "Bolhas com nomes"
 
 #: src/gui/setup_video.cpp:242
 msgid "off"
-msgstr "off"
+msgstr "Desligado"
 
 #: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
-msgstr "baixo"
+msgstr "Baixo"
 
 #: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
 msgid "high"
@@ -2548,7 +2548,7 @@ msgstr "Efeitos de partícula"
 
 #: src/gui/setup_video.cpp:295
 msgid "Show pickup notification"
-msgstr "Mostrar aviso ao pegar algo"
+msgstr "Mostrar aviso ao pegar algum item"
 
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:297
@@ -2558,24 +2558,24 @@ msgstr "em chat"
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:299
 msgid "as particle"
-msgstr "como partícula"
+msgstr "Como partícula"
 
 #: src/gui/setup_video.cpp:301
 msgid "Enable resize"
-msgstr "Habilitar redirecionamento"
+msgstr "Habilitar redirecionamento de janela"
 
 #: src/gui/setup_video.cpp:302
 msgid "No frame"
-msgstr "Sem quadros"
+msgstr "Sem moldura de janela"
 
 #: src/gui/setup_video.cpp:306
 msgid "FPS limit:"
-msgstr "Limite FPS:"
+msgstr "Limite de FPS:"
 
 #: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
 #: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
 msgid "Alt FPS limit: "
-msgstr "Limite FPS alt: "
+msgstr "Limite de FPS alternativo:"
 
 #: src/gui/setup_video.cpp:325
 msgid "Overhead text"
@@ -2583,7 +2583,7 @@ msgstr "Texto sobrescrito como:"
 
 #: src/gui/setup_video.cpp:326
 msgid "Gui opacity"
-msgstr "Opacidade"
+msgstr "Transparência de janelas"
 
 #: src/gui/setup_video.cpp:327
 msgid "Ambient FX"
@@ -2700,6 +2700,14 @@ msgstr "+"
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2710,6 +2718,11 @@ msgstr "Habilidade %d"
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2720,204 +2733,204 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, 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:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, 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:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Atq"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
-msgstr "Ignorar mobss"
+msgstr "Ignorar mobs"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
-msgstr "Você foi convidado para entrar em um grupo."
+msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr "Você foi convidado para entrar no grupo %s."
+msgstr "Você foi convidado(a) para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3108,33 +3121,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 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:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3196,7 +3209,7 @@ msgstr "Efeitos de partícula"
 
 #: src/gui/userpalette.cpp:132
 msgid "Pickup Notification"
-msgstr "Aviso ao pegar algo"
+msgstr "Aviso ao pegar algum item"
 
 #: src/gui/userpalette.cpp:133
 msgid "Exp Notification"
@@ -3220,7 +3233,7 @@ msgstr "Monstro Acerta Jogador"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr "Outro jogador ataca você"
+msgstr "Outro jogador(a) ataca você"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3497,7 +3510,7 @@ msgstr "Quem esta online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
-msgstr "KS"
+msgstr "EST"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
@@ -3937,7 +3950,7 @@ msgstr "Mudar contador de descarte"
 
 #: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
-msgstr "Curar um alvo ou você mesmo"
+msgstr "Curar um alvo ou você mesmo(a)"
 
 #: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
@@ -4008,435 +4021,443 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
-msgstr "Você foi morto por %s"
+msgstr "Você foi morto(a) por %s"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, 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:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco numero %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) não atacar amigos"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "usado para definir parâmetros customizados"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "para o cliente manaplus. "
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 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:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 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:73
+#: src/main.cpp:74
 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:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 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
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -4492,7 +4513,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Nome errado."
 
@@ -4641,7 +4662,7 @@ msgstr "Castelo Guilda : %s"
 
 #: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
-msgstr "Não foi possível convidar jogador para a guilda."
+msgstr "Não foi possível convidar jogador(a) para a guilda."
 
 #: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
@@ -4671,7 +4692,7 @@ msgstr "Você foi expulso da guilda."
 #: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s foi expulso da Guilda."
+msgstr "%s foi expulso(a) da Guilda."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
@@ -4792,70 +4813,70 @@ msgstr "Falha ao usar item."
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "A conta expirou."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 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 "
+"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
 "algum GM."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Você banido do jogo até %s.\n"
+"Você banido(a) do jogo até %s.\n"
 "Por favor entre em contato com algum GM através do fórum."
 
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Server lotado."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
@@ -4913,7 +4934,7 @@ msgstr "Um membro desconhecido tentou dizer: %s"
 
 #: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
-msgstr "Você está morto."
+msgstr "Você está morto(a)."
 
 #: 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."
@@ -4921,7 +4942,7 @@ msgstr "Lamentamos informar que seu personagem foi morto em combate."
 
 #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
-msgstr "Você não me parece assim tão vivo."
+msgstr "Você não me parece assim tão vivo(a)."
 
 #: 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."
@@ -5025,7 +5046,7 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
-msgstr "Você é um ex-jogador"
+msgstr "Você é um(a) ex-jogador(a)."
 
 #: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
@@ -5382,7 +5403,7 @@ msgstr "Convite enviado."
 
 #: src/net/manaserv/guildhandler.cpp:207
 msgid "Member was promoted successfully."
-msgstr "Membro foi promovido com sucesso."
+msgstr "Membro foi promovido(a) com sucesso."
 
 #: src/net/manaserv/guildhandler.cpp:212
 msgid "Failed to promote member."
@@ -5570,7 +5591,7 @@ msgstr "Erro de conexão desconhecido."
 
 #: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
-msgstr "Você foi desconectado do servidor!"
+msgstr "Você foi desconectado(a) do servidor!"
 
 #: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 16e7618a7..92cc956a1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-03 23:57+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:09+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"
@@ -45,47 +45,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "por peso"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "por quantidade"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "por tipo"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
-msgstr "Habilitar rolagem preguisoça "
+msgstr "Habilitar rolagem suave"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
-msgstr "Rolagem preguiçosa"
+msgstr "Rolagem suave"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,50 +95,50 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, 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:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, 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."
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -392,20 +392,20 @@ msgstr "Analizador de bot"
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Falar"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Mover"
 
@@ -418,8 +418,8 @@ msgid "Reset"
 msgstr "Resetar"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Comprar"
 
@@ -467,8 +467,8 @@ msgstr "Máximo"
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -478,18 +478,18 @@ msgstr "Vender"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -525,7 +525,7 @@ msgstr "Os emails informados não são iguais."
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Senha:"
@@ -557,7 +557,7 @@ msgid "New Character"
 msgstr "Novo Personagem"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
@@ -593,7 +593,7 @@ msgid "Race:"
 msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Criar"
 
@@ -736,7 +736,7 @@ msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -767,13 +767,13 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -913,25 +913,25 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Você Sabia?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Anterior"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Próximo >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
@@ -971,12 +971,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1014,31 +1014,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Usar"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Dividir"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -1047,17 +1047,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Armazenar"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Descartar"
@@ -1199,43 +1199,43 @@ msgstr "Aparição do JackO"
 msgid "You have left the guild."
 msgstr "Você saiu da Guilda."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normal"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Fechar"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1296,7 +1296,7 @@ msgstr "Enviar"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Limpar"
 
@@ -1329,357 +1329,357 @@ msgstr "Desequipar antes"
 
 #: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
-msgstr "Roupas de ocupado"
+msgstr "Roupas em modo ausente"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Negócios"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Mensagem Privada:"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Cura"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Ser amigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Ser inimigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Lista Negra"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Apagar"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Seguir"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Imitar"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Chutar Jogador"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Nu"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 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:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr "Despir"
 
-#: 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Add comentário"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "vender (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Chutar"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Pegar"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Nome no chat"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Mapa Item"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Remover"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Urdidura"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Feitiços"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Carregar velhos feitiços"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Remover o nome"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Sair"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 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:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Comentário do jogador"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Comentário:"
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Guardar 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Guardar metade"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Guardar tudo"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Descartar tudo"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Carregar antigos atalhos de item"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Carregar antigos atalhos de descarte"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Ocultar"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(padrão)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Mover para cima"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -1797,7 +1797,7 @@ msgstr "Habilitar música"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Enable mumble voice chat"
-msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\""
+msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)"
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
@@ -2001,7 +2001,7 @@ msgstr "Habilitar joystick"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr "Usar joystick se a janela do cliente estiver inativa"
+msgstr "Usar joystick se a janela do jogo estiver inativa"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -2093,11 +2093,11 @@ msgstr "Desenhar atalhos no mapa"
 
 #: src/gui/setup_other.cpp:87
 msgid "Enable lazy scrolling"
-msgstr "Habilitar rolagem preguiçosa"
+msgstr "Habilitar rolagem suave"
 
 #: src/gui/setup_other.cpp:90
 msgid "Scroll laziness"
-msgstr "Rolagem preguiçosa"
+msgstr "Rolagem suave"
 
 #: src/gui/setup_other.cpp:93
 msgid "Scroll radius"
@@ -2149,7 +2149,7 @@ msgstr "Mostrar popups de jogadores"
 
 #: src/gui/setup_other.cpp:129
 msgid "Afk message"
-msgstr "Mensagem Ausente"
+msgstr "Mensagem em modo Ausente"
 
 #: src/gui/setup_other.cpp:132
 msgid "Show job"
@@ -2181,7 +2181,7 @@ msgstr "Suporte de bots"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr "Habilitar suporte ao bot de leilão"
+msgstr "Habilitar suporte ao AuctionBot "
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
@@ -2229,7 +2229,8 @@ msgstr "Aceleração por HW"
 
 #: src/gui/setup_perfomance.cpp:64
 msgid "Enable opacity cache (Software, can use many memory)"
-msgstr "Habilitar cache de opacidade (Software, pode se usar muita memória)"
+msgstr ""
+"Habilitar cache de transparência (Software, pode se usar muita memória)"
 
 #: src/gui/setup_perfomance.cpp:67
 msgid "Enable map reduce (Software)"
@@ -2281,7 +2282,7 @@ msgstr "Ativar segmentação de mouse prolongado"
 
 #: src/gui/setup_players.cpp:66
 msgid "Target dead players"
-msgstr "Jogadores mortos como alvo"
+msgstr "Jogadores(as) mortos(as) como alvo"
 
 #: src/gui/setup_players.cpp:69
 msgid "Visible names"
@@ -2301,7 +2302,7 @@ msgstr "Mostrar status"
 
 #: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
-msgstr "Mostrar endereço de ip nas capturas de tela"
+msgstr "Mostrar endereço de IP em Capturas de Tela"
 
 #: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
@@ -2473,7 +2474,7 @@ msgstr "Fonte segura"
 
 #: src/gui/setup_theme.cpp:200
 msgid "Japanese font"
-msgstr "Font Japonesa"
+msgstr "Fontes japonesas"
 
 #: src/gui/setup_theme.cpp:237
 msgid "Font size"
@@ -2518,7 +2519,7 @@ msgstr "Bolhas com nomes"
 
 #: src/gui/setup_video.cpp:242
 msgid "off"
-msgstr "off"
+msgstr "Desligado"
 
 #: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
 msgid "low"
@@ -2560,24 +2561,24 @@ msgstr "em chat"
 #. TRANSLATORS: Refers to "Show own name"
 #: src/gui/setup_video.cpp:299
 msgid "as particle"
-msgstr "como partícula"
+msgstr "Como partícula"
 
 #: src/gui/setup_video.cpp:301
 msgid "Enable resize"
-msgstr "Habilitar redimensionamento"
+msgstr "Habilitar redimensionamento de janela"
 
 #: src/gui/setup_video.cpp:302
 msgid "No frame"
-msgstr "Sem quadros"
+msgstr "Sem moldura de janela"
 
 #: src/gui/setup_video.cpp:306
 msgid "FPS limit:"
-msgstr "Limite FPS:"
+msgstr "Limite de FPS:"
 
 #: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
 #: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
 msgid "Alt FPS limit: "
-msgstr "Limite FPS alt: "
+msgstr "Limite de FPS alternativo: "
 
 #: src/gui/setup_video.cpp:325
 msgid "Overhead text"
@@ -2585,7 +2586,7 @@ msgstr "Texto sobrescrito como:"
 
 #: src/gui/setup_video.cpp:326
 msgid "Gui opacity"
-msgstr "Opacidade"
+msgstr "Transparência de janelas"
 
 #: src/gui/setup_video.cpp:327
 msgid "Ambient FX"
@@ -2702,6 +2703,14 @@ msgstr "+"
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2712,6 +2721,11 @@ msgstr "Habilidade %d"
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2722,204 +2736,204 @@ msgstr "Nível: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Guilda"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, 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:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, 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:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Grupo"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, 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:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, 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:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Ataque"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Social"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr "A"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, 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:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
-msgstr "Você foi convidado para entrar em um grupo."
+msgstr "Você foi convidado(a) para entrar em um grupo."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr "Você foi convidado para entrar no grupo %s."
+msgstr "Você foi convidado(a) para entrar no grupo %s."
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, 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:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 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:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -3110,33 +3124,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 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:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Concluído"
 
@@ -3198,7 +3212,7 @@ msgstr "Efeitos de partícula"
 
 #: src/gui/userpalette.cpp:132
 msgid "Pickup Notification"
-msgstr "Aviso ao pegar algo"
+msgstr "Aviso ao pegar algum item"
 
 #: src/gui/userpalette.cpp:133
 msgid "Exp Notification"
@@ -3222,7 +3236,7 @@ msgstr "Monstro Acerta Jogador"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr "Outro jogador ataca você"
+msgstr "Outro jogador(a) ataca você"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3499,7 +3513,7 @@ msgstr "Quem esta online"
 
 #: src/gui/windowmenu.cpp:69
 msgid "KS"
-msgstr "KS"
+msgstr "EST"
 
 #: src/gui/windowmenu.cpp:71
 msgid "Smilies"
@@ -3939,7 +3953,7 @@ msgstr "Mudar contador de descarte"
 
 #: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
-msgstr "Curar um alvo ou você mesmo"
+msgstr "Curar um alvo ou você mesmo(a)"
 
 #: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
@@ -4010,434 +4024,442 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
-msgstr "Você foi morto por %s"
+msgstr "Você foi morto(a) por %s"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 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:1482
+#: src/localplayer.cpp:1483
 #, 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:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco número %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
-msgstr "(f) não atacar amigos"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
+msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
-msgstr "(A) Ausente"
+msgstr "(A) Modo Ausente"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "Manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "Usado para parâmetros customizados"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "Para o cliente Manaplus."
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 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:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 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:73
+#: src/main.cpp:74
 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:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 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
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -4493,7 +4515,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Nome errado."
 
@@ -4642,7 +4664,7 @@ msgstr "Castelo Guilda : %s"
 
 #: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
-msgstr "Não foi possível convidar jogador para a guilda."
+msgstr "Não foi possível convidar jogador(a) para a guilda."
 
 #: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
@@ -4672,7 +4694,7 @@ msgstr "Você foi expulso da guilda."
 #: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s foi expulso da Guilda."
+msgstr "%s foi expulso(a) da Guilda."
 
 #: src/net/ea/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
@@ -4793,53 +4815,53 @@ msgstr "Falha ao usar item."
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "A conta expirou."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 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 "
+"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
 "algum GM."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4848,15 +4870,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:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Servidor lotado."
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente. "
 
@@ -4918,7 +4940,7 @@ msgstr "Você está morto."
 
 #: 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 "Lamentamos informar que seu personagem foi morto em combate."
+msgstr "Lamentamos informar que seu personagem foi morto(a) em combate."
 
 #: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
@@ -5026,7 +5048,7 @@ msgstr ""
 
 #: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
-msgstr "Você é um ex-jogador"
+msgstr "Você é um ex-jogador(a)"
 
 #: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
@@ -5571,7 +5593,7 @@ msgstr "Erro de conexão desconhecido."
 
 #: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
-msgstr "Você foi desconectado do servidor!"
+msgstr "Você foi desconectado(a) do servidor!"
 
 #: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
diff --git a/po/ru.po b/po/ru.po
index f04b59c32..5d32213fe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
-"PO-Revision-Date: 2012-02-02 16:46+0000\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"PO-Revision-Date: 2012-02-05 23:11+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -45,47 +45,47 @@ msgstr "О"
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,50 +95,50 @@ msgstr "Смена игрового сервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -329,43 +329,43 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -398,20 +398,20 @@ msgstr "Окно детектора ботов"
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Атака"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "Разговор"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Движение"
 
@@ -424,8 +424,8 @@ msgid "Reset"
 msgstr "Сбросить"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Купить"
 
@@ -473,8 +473,8 @@ msgstr "Макс"
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -484,18 +484,18 @@ msgstr "Продать"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -531,7 +531,7 @@ msgstr "Адрес E-mail не совпадает"
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Пароль:"
@@ -563,7 +563,7 @@ msgid "New Character"
 msgstr "Новый персонаж"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Имя:"
 
@@ -599,7 +599,7 @@ msgid "Race:"
 msgstr "Раса:"
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Создать"
 
@@ -742,7 +742,7 @@ msgid "rainbow 3"
 msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -773,13 +773,13 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -919,25 +919,25 @@ msgstr "Вх.: %d байт/сек."
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "Вы знаете?"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "< Предыдущий"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "Следующий >"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
@@ -977,12 +977,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Снять"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Помощь"
 
@@ -1020,31 +1020,31 @@ msgid "Filter:"
 msgstr "Фильтр:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Использовать"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Бросить"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Разделить"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -1053,17 +1053,17 @@ msgid "Weight:"
 msgstr "Вес:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "Сохранить"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Получить"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Бросить"
@@ -1207,43 +1207,43 @@ msgstr "jacko появляется"
 msgid "You have left the guild."
 msgstr "Вы покинули гильдию."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Нормально"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Авт. закрыть"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Пропустить"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Польз. сайт обновлений"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Запомнить логин"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Обновления:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Сменить сервер"
 
@@ -1304,7 +1304,7 @@ msgstr "Применить"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Очистить"
 
@@ -1339,355 +1339,355 @@ msgstr "Сначала снять"
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Торговать"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "Приват"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "Лечить"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "Подружиться"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr "Пренебречь"
 
-#: 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
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr "Черный список"
 
-#: 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
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
-#: 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
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr "Стереть"
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: src/playerrelations.cpp:465
 msgid "Completely ignore"
 msgstr "@@ignore|Полностью игнорировать@@"
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "Следовать"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr "Имитировать"
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "Кикнуть игрока"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr "Уничтожить"
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr "Показать предметы"
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "Добавить коментарий"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr "Кикнуть"
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "Поднять"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Элмент карты"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr "Удалить"
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr "Прыгнуть"
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Заклинания"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr "Загрузить старые заклинания"
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "Скрывать имя"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "Рарешить режим отошел"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr "Запретить режим отошел"
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Покинуть"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Имя:                    "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "Комментарий             "
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "Комментарий:                      "
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Сохранить 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Сохранить половину"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Сохранить все"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "Бросить все"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Получить половину"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Получить все"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Загрузить старые горячие клавиши предметов"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Загрузить старые данные"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Спрятать"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Показать"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(по умолчанию)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "Передвинуть выше"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2717,6 +2717,14 @@ msgstr "Верх"
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr "базовые"
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr "Умение: базовое, Ид: 1"
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2727,6 +2735,11 @@ msgstr "Умение %d"
 msgid "Skill %d"
 msgstr "Умение %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr "Умение: %s, Ид: %d"
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2737,204 +2750,204 @@ msgstr "Уровень: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "Гильдия"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Выход из гильдии %s запрошен."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "Приглашение игрока в Гильдию"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого вы хотите пригласить в гильдию %s?"
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Покинуть Гильдию?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "Группа"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Нав"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr "Атк"
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Создать Гильдию"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Создать группу"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Общество"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr "Д"
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не порвое."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Имя группы"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -3126,33 +3139,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Играть"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Завершено"
 
@@ -4027,42 +4040,42 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr "Вас убил %s"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4070,390 +4083,398 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1719
+msgid "xp"
+msgstr "опыт"
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr "работа"
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) сумасшедшее движение %d"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr "(f) атаковать всех кроме друзей"
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr "(d) не атаковать игроков"
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "Вы видите "
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [параметры] [файл-manaplus]"
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)"
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr "                  используется для указания дополнительных параметров"
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr "                  в клиенте."
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "Опции:"
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Использовать указанный файл как лог"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Использовать указанный каталог для лога"
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Показать версию"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Показать эту справку"
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Использовать указанный каталог конфигурации"
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Войти с указанным логином"
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Войти с указанным паролем"
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Использовать указанный персонаж"
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Имя или IP сервера авторизации"
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Порт сервера авторизации"
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Использовать этот узел обновлений"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Пропустить обновление"
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Загрузить игровые данные из этого каталога"
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Каталог для локальных данных"
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Сохранять скриншоты в указанном каталоге"
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Запуск игры в безопасном режиме"
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Не использовать OpenGL для этой сессии"
 
@@ -4510,7 +4531,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
@@ -4808,51 +4829,51 @@ msgstr "Не удалось использовать предмет."
 msgid "Unable to equip."
 msgstr "Нельзя экипировать!"
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "Учетная запись не найдена. Попробуйте снова."
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "Старый пароль указан неверно."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID"
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "Неверный пароль"
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера.."
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "Клиент устарел"
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4860,15 +4881,15 @@ msgid ""
 msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr "Сервер переполнен"
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr "Пользователь удален"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca72c8765..271a4d4ef 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-04 15:55+0300\n"
+"POT-Creation-Date: 2012-02-06 02:06+0300\n"
 "PO-Revision-Date: 2012-02-02 16:45+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -43,47 +43,47 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:969 src/gui/setup_video.cpp:319
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:970
+#: src/client.cpp:974
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1088
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1121
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1222
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1257
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1267
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,50 +93,50 @@ msgstr "更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1326
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1352
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1353
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1373
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1393
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1394
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
+#: src/client.cpp:2079 src/client.cpp:2086
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1780
+#: src/client.cpp:1785
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1819 src/client.cpp:1825
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1846
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -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:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -382,20 +382,20 @@ msgstr "挂机检查"
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
 #: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻击"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
 #: src/keyboardconfig.cpp:62
 msgid "Talk"
 msgstr "说话"
 
-#: 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
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "移动"
 
@@ -408,8 +408,8 @@ msgid "Reset"
 msgstr "重置"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "购买"
 
@@ -457,8 +457,8 @@ msgstr "最大"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -468,18 +468,18 @@ msgstr "出售"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 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:1198
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
 #: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "取消"
 
@@ -515,7 +515,7 @@ msgstr "电子邮件地址不匹配。"
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密码："
@@ -547,7 +547,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "姓名"
 
@@ -583,7 +583,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "建立"
 
@@ -726,7 +726,7 @@ msgid "rainbow 3"
 msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
 #: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
 #: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
@@ -757,13 +757,13 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: 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
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "忽略"
 
@@ -903,25 +903,25 @@ msgstr "输入:%d 字节/"
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr "你知道吗？"
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr "<上一页"
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr "下一页>"
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
@@ -961,12 +961,12 @@ 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:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "帮助"
 
@@ -1004,31 +1004,31 @@ msgid "Filter:"
 msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "装备"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: 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
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "使用"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "掉落... ..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "分离"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "套装"
 
@@ -1037,17 +1037,17 @@ msgid "Weight:"
 msgstr "重量："
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
 msgid "Store"
 msgstr "存储"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丢弃"
@@ -1187,43 +1187,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr "你已经离开工会."
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "正常"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "自动关闭"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "跳过"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "服务器："
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "自定义更新主机"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "记住用户名"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "更新日期："
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "更改服务器"
 
@@ -1284,7 +1284,7 @@ msgstr "提交"
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "清除"
 
@@ -1319,355 +1319,355 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr "密语"
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr "愈合"
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr "是朋友"
 
-#: 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
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: 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: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:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
-#: src/gui/popupmenu.cpp:702
-msgid "Set as enemy"
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
 msgstr ""
 
 #: 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:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
 #: 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
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: 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
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 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/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
 #: 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
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr "按照"
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr "踢从党"
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr "踢从公会"
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr "踢球员"
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr "显示项目"
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 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
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr "发表评论"
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr "购买(?)"
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr "出售(?)"
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr "拾取"
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "加入聊天"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "地图项"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr "重命名"
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "法术"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "禁用"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "启用突出"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr "移除姓名"
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr "启用远"
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "留下"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "重命名的地图标志"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "名称："
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr "玩家评论"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr "评论："
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "商店10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "商店的一半"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "商店所有"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr "所有"
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "拿出10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "拿出一半"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "检索所有"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "隐藏"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "显示"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
 msgid "Copy to chat"
 msgstr ""
 
-#: 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
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr "x"
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
@@ -2685,6 +2685,14 @@ msgstr "升级"
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2695,6 +2703,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr "技能为%d"
 
+#: src/gui/skilldialog.cpp:438
+#, fuzzy, c-format
+msgid "Skill: %s, Id: %d"
+msgstr "技能为%d"
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2705,204 +2718,204 @@ msgstr "等级: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
 #: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
 msgid "Guild"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
 msgid "Party"
 msgstr "t"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -3092,33 +3105,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 msgid "Name: %s"
 msgstr "姓名：%s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "已完成"
 
@@ -3988,429 +4001,438 @@ msgid ""
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:386
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1444
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1447
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1450
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1453
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1456
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1459
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1483
 #, 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:1902
+#: src/localplayer.cpp:1719
+#, fuzzy
+msgid "xp"
+msgstr "经验："
+
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2071
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2072
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2073
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2074
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2075
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2076
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2077
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2078
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2091
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2092
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2093
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2094
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2095
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2096
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2115
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2116
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2117
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2118
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2119
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2120
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2139
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2140
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2141
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2142
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2143
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2162
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2163
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2164
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2192
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2211
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2212
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2226
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2227
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2252
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2253
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2254
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3772
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3781
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4139
 msgid "You see "
 msgstr "你看"
 
-#: src/main.cpp:50
+#: src/main.cpp:51
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:52
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:54
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:55
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:57
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:57
+#: src/main.cpp:58
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l--log-file 日志文件"
 
-#: src/main.cpp:58
+#: src/main.cpp:59
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:60
 msgid "  -v --version        : Display the version"
 msgstr "-v --version: 显示版本"
 
-#: src/main.cpp:60
+#: src/main.cpp:61
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:62
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:63
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:64
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:65
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:66
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:67
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:68
 msgid "     --update-host    : Use this update host"
 msgstr "--update-host:    使用此更新主机"
 
-#: src/main.cpp:68
+#: src/main.cpp:69
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:71
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:72
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:74
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:76
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:77
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:78
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:81
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4466,7 +4488,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:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr "错误的名称。"
 
@@ -4763,51 +4785,51 @@ msgstr "使用物品失败。"
 msgid "Unable to equip."
 msgstr "无法装备。"
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录。"
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "旧密码不正确。"
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr "新密码太短。"
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: 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:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr "未注册的ID。"
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr "错误的密码。"
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr "账户过期失效。"
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队。"
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr "客户端太旧。"
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -4816,15 +4838,15 @@ msgstr ""
 "你被暂时禁止进入游戏直到%s.\n"
 "请通过论坛联系GM组"
 
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""