Update and rebuild translations.

Fix translation bug "Ok" -> "OK".
author: Andrei Karas <akaras@inbox.ru> 2012-02-02 16:52:56 +0300
committer: Andrei Karas <akaras@inbox.ru> 2012-02-02 16:52:56 +0300
commit: 25a203cc7117ab67d3809f24b5fdd23a3653ef99 (patch)
tree: c1fdaf9e8f8672a9d2c30ce9ccec6fa435baecc2 /po
parent: e2742faa6506472af481ff58a35a0610ee7d4edd (diff)
download: plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.tar.gz
plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.tar.bz2
plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.tar.xz
plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.zip
16 files changed, 5721 insertions, 5416 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8feef4b97..652b43d3f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,6 +18,7 @@ src/gui/connectiondialog.cpp
 src/gui/debugwindow.cpp
 src/gui/didyouknowwindow.cpp
 src/gui/editdialog.cpp
+src/gui/editserverdialog.cpp
 src/gui/equipmentwindow.cpp
 src/gui/helpwindow.cpp
 src/gui/inventorywindow.cpp
diff --git a/po/cs.po b/po/cs.po
index 97aac2408..c5689aa5a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
 "cs/)\n"
@@ -34,122 +34,122 @@ msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Nelze zaslat prázdné šeptání!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,105 +158,105 @@ msgstr ""
 "Nelze vytvořit záložku se šeptáním pro \"%s\"! Buďto záložka existuje nebo "
 "jsi to ty."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Chybí jméno guildy."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Zpráva zavírá chat."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Enter nyní přepíná chat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukončuje chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "přítel"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "přehlížený"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutrální"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Hráč je již %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hráč byl úspěšně zařazen jako %s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Hráč nemůže být zařazen jako %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Hráč nebyl ignorován!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Hráč již není ignorován!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Hráč nemůže být odignorován!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Hráč již byl vymazán!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Hráč byl úspěšně vymazán!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -264,7 +264,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -272,7 +272,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -280,7 +280,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -288,7 +288,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -296,27 +296,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "velikost chache fontů"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Velikost cache:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Vytvořeno:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Odstraněno:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -325,43 +325,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Snímky obrazovky ukládat jako "
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Chyba sítě"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Nelze načíst mapu"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Chyba při načítání %s"
@@ -437,23 +437,23 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Ukončit"
@@ -477,21 +477,21 @@ msgid "Sell"
 msgstr "Prodej"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Heslo:"
@@ -554,68 +554,73 @@ msgstr "Nové heslo musí být méně než.%d znaků dlouhé."
 msgid "The new password entries mismatch."
 msgstr "Nová hesla nesouhlasí."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Vytvořit postavu"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Jméno:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Účes:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Stav postavy je OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -657,9 +662,9 @@ msgstr "Zadej heslo pro smazání postavy"
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Smazat"
 
@@ -734,7 +739,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -746,12 +751,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomno: %s; %d hráčů je přítomno."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -916,7 +921,7 @@ msgstr "Víte že ... ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
@@ -932,11 +937,36 @@ msgstr "Další >"
 msgid "Auto open this window"
 msgstr "Automaticky otevírat toto okno"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Typ serveru:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Vybavení"
@@ -1034,39 +1064,39 @@ msgstr "Vzít"
 msgid "Drop"
 msgstr "Upustit"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Vše"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Vyberte množství předmětů, které chcete obdržet."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Neznámý."
 
@@ -1185,32 +1215,31 @@ msgstr "Automaticky zavírat"
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Přihlášení"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Vlastní host updatů"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Pamatovat přihlášení"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Updaty:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Změnit server"
 
@@ -1287,12 +1316,12 @@ msgstr "Odeslat"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Odeslání se nezdařilo. odesílatel nebo dopis není platný."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1698,64 +1727,58 @@ msgstr "Heslo musí být kratší než %d znaků."
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Zvolte server"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Typ serveru:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Načíst"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Připojit"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Vlastní server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Přidat"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Prosím zadejte adresu a port serveru."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Upravit"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -2320,23 +2343,23 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Povolit šeptání"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Starý"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Vztahy"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Když ignoruji:"
 
@@ -2464,8 +2487,8 @@ msgstr "Velikost písma"
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
@@ -2517,151 +2540,150 @@ msgstr "střední"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Částicové efekty"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Zobrazit informaci o sebrání předmětu"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "v chatu"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "jako částici"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Omezení FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Altern. FPS omezení:"
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Neprůhlednost GUI"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Detaily částic"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Žádné"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
 "selhalo!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Přepínám na celou obrazovku"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Měním na OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Zadej nové rozlišení:"
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Rozlišení obrazovky změněno"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Některá okna mohou být přesunuta aby se vešly do menšího okna."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Nastavení částicových efektů bylo změněno."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Změny se projeví až po změně mapy."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Koupit věci"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Prodat věci"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Přidat"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Oznámit"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Zobrazit odkazy v oznámení"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Aukce"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
@@ -3264,23 +3286,23 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3419,10 +3441,6 @@ msgstr ""
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Upravit"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3673,7 +3691,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
@@ -3800,184 +3818,186 @@ msgstr "Smajlíky"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Zkratka smajlíku %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Obléct výstroj"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Kopírovat výstroj"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Kopírovat výbavu do výstroje"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Rolovat chat nahoru"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Rolovat chat dolů"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Předchozí záložka chatu"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Další záložka chatu"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Zavřít stávající záložku chatu"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Předchozí řádek chatu"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Další řádek chatu"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Autodoplňování v chatu"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Deaktivovat vstup chatu"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignorovat vstup 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignorovat vstup 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Otočit nahoru"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Otočit dolů"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Otočit vlevo"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Otočit vpravo"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Šílené pohyby"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Změnit mód šílených pohybů"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Rychlé léčení cíle nebo sebe"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Použít kouzlo #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Použít magický útok"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Přepnout magický útok"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Změnit typ pohybu"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Změnit typ útočné zbraně"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Změnit typ útoku"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Změnit mód následování"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Změnit mód imitace"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Zapnout/Vypnout audio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Zapnout/Vypnout Away mód"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Emulovat pravý klik z klávesnice"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "přemnout mód kamery"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Klávesa modifikátoru"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3986,42 +4006,42 @@ msgstr ""
 "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
 "chovat podivně."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4029,292 +4049,292 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) útok"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr před 2x3 pole"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) away"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Vidíte "
 
diff --git a/po/de.po b/po/de.po
index 14bd2763a..067f5983f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,13 +8,14 @@
 #   <der.loisl@gmx.de>, 2011.
 #   <jack@krass.com>, 2011.
 #   <Necromong@inbox.ru>, 2011.
+# Philipp  <philipp.krueger1@googlemail.com>, 2012.
 # Rosemarie Tauber <horos@online.de>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
 "de/)\n"
@@ -37,123 +38,123 @@ msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Leistung"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -162,160 +163,160 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
 "oder du bist es selbst."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Anfrage den Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Name der Gilde fehlt."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Enter aktiviert jetzt den Chat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Nachricht schließt jetzt den Chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "unbeachtet"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "Feind"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Spieler erfolgreich gelöscht!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Erstellt:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Gelöscht:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -325,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:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto gespeichert unter"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Karte konnte nicht geladen werden."
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
@@ -384,7 +385,7 @@ msgstr "Pvp Rang: %d"
 #: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
-msgstr ""
+msgstr "Kommentar: %s"
 
 #: src/gui/botcheckerwindow.cpp:266
 msgid "Bot Checker"
@@ -437,23 +438,23 @@ msgstr "Menge"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Beenden"
@@ -477,21 +478,21 @@ msgid "Sell"
 msgstr "Verkaufen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -527,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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Passwort:"
@@ -554,68 +555,73 @@ msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
 msgid "The new password entries mismatch."
 msgstr "Die Passwörter stimmen nicht überein."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Charakter erstellen"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Name :"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Rasse:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Männlich"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -657,9 +663,9 @@ msgstr "Gebe dein Passwort ein, um den Charakter zu löschen"
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Löschen"
 
@@ -734,7 +740,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -746,12 +752,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -785,7 +791,7 @@ msgstr "Ziel"
 
 #: src/gui/debugwindow.cpp:74
 msgid "Net"
-msgstr ""
+msgstr "Net"
 
 #: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
 #: src/gui/debugwindow.cpp:251
@@ -814,7 +820,7 @@ msgstr "Spieler-Position:"
 
 #: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
-msgstr ""
+msgstr "Partikelanzahl:"
 
 #: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
 #: src/gui/debugwindow.cpp:256
@@ -843,7 +849,7 @@ msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
-msgstr ""
+msgstr "Texturanzahl:"
 
 #: src/gui/debugwindow.cpp:233
 #, c-format
@@ -916,7 +922,7 @@ msgstr "Wusstest du schon?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
@@ -932,11 +938,36 @@ msgstr "Vor >"
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Server Typ:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ausrüstung"
@@ -954,23 +985,23 @@ msgstr "Hilfe"
 
 #: src/gui/inventorywindow.cpp:71
 msgid "by name"
-msgstr ""
+msgstr "nach Name"
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
-msgstr ""
+msgstr "nach Id"
 
 #: src/gui/inventorywindow.cpp:73
 msgid "by weight"
-msgstr ""
+msgstr "nach Gewicht"
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
-msgstr ""
+msgstr "nach Anzahl"
 
 #: src/gui/inventorywindow.cpp:75
 msgid "by type"
-msgstr ""
+msgstr "nach Art"
 
 #: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
 #: src/inventory.cpp:249
@@ -1034,39 +1065,39 @@ msgstr "Abholen"
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du handeln möchtest."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände du aufbewahren möchtest."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände du abholen möchtest."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Wähle Anzahl der Gegenstände die Du aufteilen möchtest."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Füge zu Einkaufsladen hinzu."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Füge zu Verkaufsladen hinzu."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -1099,7 +1130,7 @@ msgstr "Level: %d bei %f%%"
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d/%d Übrig: %d"
 
 #: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
 #: src/gui/killstats.cpp:228
@@ -1123,7 +1154,7 @@ msgstr ""
 #: src/gui/killstats.cpp:240
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Kills/Min: %s, Exp/Min: %s"
 
 #: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
 #: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
@@ -1143,7 +1174,7 @@ msgstr[1] ""
 
 #: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Letze exp:"
 
 #: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
 #: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
@@ -1183,32 +1214,31 @@ msgstr "automatisch schließen"
 msgid "Skip"
 msgstr "überspringen"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Updateserver verwalten"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Benutzername merken"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
@@ -1285,12 +1315,12 @@ msgstr "Senden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Ausrüstung: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1339,7 +1369,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693
 #: src/gui/popupmenu.cpp:716
 msgid "Black list"
-msgstr ""
+msgstr "Schwarze Liste"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
 #: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415
@@ -1370,7 +1400,7 @@ msgstr "Löschen"
 #: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721
 #: src/gui/popupmenu.cpp:726
 msgid "Unignore"
-msgstr ""
+msgstr "Nicht mehr Ignorieren"
 
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
@@ -1396,12 +1426,12 @@ msgstr "Lade ein zu Party"
 #: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
 #: src/gui/popupmenu.cpp:774
 msgid "Kick from party"
-msgstr ""
+msgstr "Aus Party werfen"
 
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
 #: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
 msgid "Kick from guild"
-msgstr ""
+msgstr "Aus Gilde werfen"
 
 #: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
 #: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
@@ -1411,11 +1441,11 @@ msgstr ""
 #: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
 #: src/gui/popupmenu.cpp:805
 msgid "Invite to guild"
-msgstr ""
+msgstr "In Gilde einladen"
 
 #: src/gui/popupmenu.cpp:265
 msgid "Kick player"
-msgstr ""
+msgstr "Spieler rauswerfen"
 
 #: src/gui/popupmenu.cpp:267
 msgid "Nuke"
@@ -1424,7 +1454,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
 #: src/gui/popupmenu.cpp:828
 msgid "Show Items"
-msgstr ""
+msgstr "Zeige Items"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
 #: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
@@ -1449,7 +1479,7 @@ msgstr "Verkaufen(?)"
 
 #: src/gui/popupmenu.cpp:312
 msgid "Kick"
-msgstr ""
+msgstr "Rauswerfen"
 
 #: src/gui/popupmenu.cpp:323
 msgid "Remove from attack list"
@@ -1469,7 +1499,7 @@ msgstr "Hinzufügen zur Ignorierenliste"
 
 #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
 msgid "Add name to chat"
-msgstr ""
+msgstr "Füge Name dem Chat hinzu"
 
 #: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
 msgid "Players"
@@ -1511,11 +1541,11 @@ msgstr "Zaubersprüche"
 
 #: src/gui/popupmenu.cpp:609
 msgid "Load old spells"
-msgstr ""
+msgstr "Lade alte Zaubersprüche"
 
 #: src/gui/popupmenu.cpp:610
 msgid "Edit spell"
-msgstr ""
+msgstr "Bearbeite Zauberspruch"
 
 #: src/gui/popupmenu.cpp:636
 msgid "Disable highlight"
@@ -1604,7 +1634,7 @@ msgstr "Alles aufbewahren"
 #: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
 #: src/gui/popupmenu.cpp:1967
 msgid "Drop all"
-msgstr ""
+msgstr "Alles fallenlassen"
 
 #: src/gui/popupmenu.cpp:1843
 msgid "Retrieve 10"
@@ -1650,11 +1680,11 @@ msgstr "(normal)"
 
 #: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
 msgid "Move up"
-msgstr ""
+msgstr "Nach oben"
 
 #: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
 msgid "Move down"
-msgstr ""
+msgstr "Nach unten"
 
 #: src/gui/quitdialog.cpp:52
 msgid "Switch server"
@@ -1696,64 +1726,58 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Server Typ:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Server verwalten"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Bitte die Adresse und den Port eines Servers eingeben"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Ändern"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -1830,7 +1854,7 @@ msgstr "Lasse magische und GM-Nachrichten in allen Chat Tabs zu"
 
 #: src/gui/setup_chat.cpp:70
 msgid "Limits"
-msgstr ""
+msgstr "Limit"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Limit max chars in chat line"
@@ -1902,7 +1926,7 @@ msgstr "Benutze lokale Zeit"
 
 #: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
 msgid "Other"
-msgstr ""
+msgstr "Sonstig"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Highlight words (separated by comma)"
@@ -1993,7 +2017,7 @@ msgstr "Stopp"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Drehe den Controlstick und drücke keine Tasten"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2125,7 +2149,7 @@ msgstr "Zeige \"job exp\"-Nachrichten"
 
 #: src/gui/setup_other.cpp:126
 msgid "Show players popups"
-msgstr ""
+msgstr "Zeige Spieler-Popups"
 
 #: src/gui/setup_other.cpp:129
 msgid "Afk message"
@@ -2157,11 +2181,11 @@ msgstr "Protokolliere NPC Dialoge"
 
 #: src/gui/setup_other.cpp:157
 msgid "Bots support"
-msgstr ""
+msgstr "Bot unterstützung"
 
 #: src/gui/setup_other.cpp:159
 msgid "Enable auction bot support"
-msgstr ""
+msgstr "Aktiviere auction bot unterstützung"
 
 #: src/gui/setup_other.cpp:162
 msgid "Enable guild bot support and disable native guild support"
@@ -2277,7 +2301,7 @@ msgstr ""
 
 #: src/gui/setup_players.cpp:78
 msgid "Show statuses"
-msgstr ""
+msgstr "Zeige Stattistiken"
 
 #: src/gui/setup_players.cpp:81
 msgid "Show ip addresses on screenshots"
@@ -2285,7 +2309,7 @@ msgstr "IP auf Screenshots anzeigen."
 
 #: src/gui/setup_players.cpp:84
 msgid "Allow self heal with mouse click"
-msgstr ""
+msgstr "Erlaube Selbstheilung mittels Mausklick"
 
 #: src/gui/setup_relations.cpp:65
 msgid "Relation"
@@ -2319,23 +2343,23 @@ msgstr ""
 msgid "Enemy"
 msgstr "Feind"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Alt"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
@@ -2463,8 +2487,8 @@ msgstr "Schriftgröße"
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2516,156 +2540,155 @@ msgstr "Mittel"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "im Chatfenster"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Alt FPS Limit:"
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Partikeldetail"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Kein(e)"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
 "Auflösung schlug fehl."
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
 "Auflösung schlug fehl."
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Wechsle zu OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Neue Auflösung eingeben:"
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Bildschirmauflösung wurde geändert"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Partikeleffekteinstellungen wurden verändert"
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Persönlicher Laden"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Kaufe Dinge"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Verkaufe Dinge"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Teile mit"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
-msgstr ""
+msgstr "Zeige Links in Ankündigung"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
@@ -2770,11 +2793,11 @@ msgstr "Bist du sicher, dass du die Party %s verlassen willst?"
 
 #: src/gui/socialwindow.cpp:649
 msgid "Nav"
-msgstr ""
+msgstr "Nav"
 
 #: src/gui/socialwindow.cpp:927
 msgid "Atk"
-msgstr ""
+msgstr "Atk"
 
 #: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
@@ -2786,7 +2809,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
-msgstr ""
+msgstr "Ignoriere Monster"
 
 #: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
@@ -3014,7 +3037,7 @@ msgstr "Befehl:"
 
 #: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
-msgstr ""
+msgstr "Kommentar:"
 
 #: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
@@ -3248,11 +3271,11 @@ msgstr "Betretbarer Boden"
 
 #: src/gui/userpalette.cpp:159
 msgid "Local Player Attack Range"
-msgstr ""
+msgstr "Lokale Spieler-Attackenreichweite"
 
 #: src/gui/userpalette.cpp:161
 msgid "Local Player Attack Range Border"
-msgstr ""
+msgstr "Rand der Attackenreichweite des Lokalen Spielers"
 
 #: src/gui/userpalette.cpp:163
 msgid "Monster Attack Range"
@@ -3264,29 +3287,29 @@ msgstr "Stammplatz"
 
 #: src/gui/userpalette.cpp:167
 msgid "Home Place Border"
-msgstr ""
+msgstr "Stamm platz Grenze"
 
 #: src/gui/userpalette.cpp:169
 msgid "Road Point"
 msgstr "Wegpunkt"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online - Aktualisiere"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Aktualisierung"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Wer ist Online -"
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -3415,24 +3438,20 @@ msgstr ""
 #: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
 #: src/net/ea/gui/partytab.cpp:69
 msgid "/help > Display this help."
-msgstr ""
+msgstr "/help > zeige diese Hilfe."
 
 #: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
 msgid "/invite > Invite a player to your guild"
-msgstr ""
+msgstr "/invite > Lade einen Spieler in deine Party ein"
 
 #: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/leave > Leave the guild you are in"
-msgstr ""
+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 ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Ändern"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Anderen Spieler ignorieren"
@@ -3460,6 +3479,7 @@ msgstr "Befehl:/ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
+"Dieser Kommando ignoriert andere Spieler ohne Rücksicht auf Beziehungen."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3468,6 +3488,8 @@ msgstr "Befehl: /unignore <Spieler>"
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Dieser Kommando stoppt das Ignorieren eines Spielers, sofern er ignoriert "
+"wird."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3599,7 +3621,7 @@ msgstr "Gehe zu Ziel"
 
 #: src/keyboardconfig.cpp:54
 msgid "Change Move to Target type"
-msgstr ""
+msgstr "Verändere Bewege dich zum Ziel-Typus"
 
 #: src/keyboardconfig.cpp:56
 msgid "Move to Home location"
@@ -3611,7 +3633,7 @@ msgstr "Setzte Stammplatz"
 
 #: src/keyboardconfig.cpp:60
 msgid "Move to navigation point"
-msgstr ""
+msgstr "Bewege zum Navigationspunkt"
 
 #: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
@@ -3623,7 +3645,7 @@ msgstr ""
 
 #: src/keyboardconfig.cpp:66
 msgid "Target Closest"
-msgstr ""
+msgstr "Markiere Nähesten"
 
 #: src/keyboardconfig.cpp:68
 msgid "Target NPC"
@@ -3683,7 +3705,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
@@ -3810,184 +3832,186 @@ msgstr "Grinsen"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Ausrüstung anziehen"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Ausrüstung kopieren"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Chat Tasten"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Schließe aktuellen Tab"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
-msgstr ""
+msgstr "Vorherige Chat-Zeile"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
-msgstr ""
+msgstr "Nächste Chat-Zeile"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
-msgstr ""
+msgstr "Chat Autovervollständigung"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Deaktiviere Chateingabe"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Andere Tasten"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
-msgstr ""
+msgstr "Richtung oben"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
-msgstr ""
+msgstr "Richtung unten"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
-msgstr ""
+msgstr "Richtung links"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
-msgstr ""
+msgstr "Richtung rechts"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Verrückte Bewegungen"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
-msgstr ""
+msgstr "Lass N Items von Slot 0 fallen"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
-msgstr ""
+msgstr "Lass N Items fallen"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
-msgstr ""
+msgstr "Heile Ziel/dich selbst"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Benutze #itenplz Spruch"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Benutze magische Angriff"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Wechsle magische Angriff"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Wechsle die Bewegungsart"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Wechsle Angriffsart"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Wechle Folgenmodus"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Wechsle Imitierenmodus"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Aktiviere / Deaktiviere Spielmodifikations Tasten"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "An/Aus Audio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Aktiviere/Deaktiviere abwesend Modus"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
-msgstr ""
+msgstr "Ändere Kameramodus"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3996,334 +4020,334 @@ msgstr ""
 "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
 "das Spiel lässt sich nicht richtig steuern."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer"
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "Inventar ist voll"
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß"
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem"
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
-msgstr ""
+msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) normale Bewegungen"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) bewegungen umkehren"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
-msgstr ""
+msgstr "(?) unbekannte Bewegung"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) verrückte Bewegung"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
-msgstr ""
+msgstr "(a) Bogenschützen Angriffsreichweite"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) gehe und greife an"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) gehe, greife an, hebe auf"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) ohne automatischen Angriff"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) kleine aufhebe Zelle 1x1"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) normale aufhebe Zelle 2x1"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) aufheben"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) Normale Kartenansicht"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) Debug Kartenansicht"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) Ultra Kartenansicht"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) Ultra Kartenansicht 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) Leere Kartenansicht"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) Schwarz-Weiß Kartenansicht"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) benutze #flar als magischen Angriff"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) benutze #chiza als magischen Angriff"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) benutze #ingrav als magischen Angriff"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) benutze #frillyar als magischen Angriff"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) benutze #upmarmu als magischen Angriff"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) magischer Angriff"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) greife keine Spieler an"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) normale Imitation"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) Outfit Imitation"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
-msgstr ""
+msgstr "Imitation abgebrochen"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Du siehst"
 
@@ -4505,7 +4529,7 @@ msgstr "Charakter gelöscht"
 
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
-msgstr ""
+msgstr "Konnte Character nicht löschen."
 
 #: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
 #: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
@@ -4517,7 +4541,7 @@ msgstr ""
 #: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+msgstr "Flüstern konnte nicht gesendet werden, %s ist nicht online."
 
 #: src/net/ea/chathandler.cpp:137
 #, c-format
@@ -4686,7 +4710,7 @@ msgstr ""
 
 #: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
-msgstr ""
+msgstr "Befehl: /item <Regel>"
 
 #: src/net/ea/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
@@ -4746,23 +4770,23 @@ msgstr ""
 
 #: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
 msgid "Experience sharing enabled."
-msgstr ""
+msgstr "Erfahrung teilen ist aktiviert."
 
 #: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
 msgid "Experience sharing disabled."
-msgstr ""
+msgstr "Erfahrung teilen ist deaktiviert."
 
 #: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
 msgid "Experience sharing not possible."
-msgstr ""
+msgstr "Erfahrung teilen nicht möglich."
 
 #: src/net/ea/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
-msgstr ""
+msgstr "Erfahrung teilen unbekannt."
 
 #: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
-msgstr ""
+msgstr "Kann diesen Gegenstand nicht verwenden."
 
 #: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
@@ -4837,17 +4861,17 @@ msgstr ""
 
 #: src/net/ea/partyhandler.cpp:82
 msgid "Party successfully created."
-msgstr ""
+msgstr "Party erfolgreich erstellt."
 
 #: src/net/ea/partyhandler.cpp:138
 #, c-format
 msgid "%s has joined your party."
-msgstr ""
+msgstr "%s ist deiner Party beigetreten."
 
 #: src/net/ea/partyhandler.cpp:174
 #, c-format
 msgid "%s is already a member of a party."
-msgstr ""
+msgstr "%s is bereits ein Mitglied deiner Party."
 
 #: src/net/ea/partyhandler.cpp:179
 #, c-format
@@ -5281,7 +5305,7 @@ msgstr "Spielfigurattribute sind zu klein"
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
 msgid "At least one stat is out of the permitted range: (%u - %u)."
-msgstr ""
+msgstr "Einer oder mehr Stats sind außerhalb der erlaubten Werte: (%u - %u)."
 
 #: src/net/manaserv/charhandler.cpp:178
 msgid "Invalid slot number."
@@ -5348,7 +5372,7 @@ msgstr "%s hat %s gekickt."
 
 #: src/net/manaserv/chathandler.cpp:337
 msgid "Unknown channel event."
-msgstr ""
+msgstr "Unbekannter Befehl."
 
 #: src/net/manaserv/guildhandler.cpp:90
 msgid "Error creating guild."
diff --git a/po/es.po b/po/es.po
index 8d3ecbf6c..2192750b1 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-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/es/)\n"
@@ -36,122 +36,122 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +160,160 @@ msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Falta el nombre del Clan."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "en la lista negra"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "enemigo"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Tam. caché:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -323,43 +323,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Captura de pantalla guardada como "
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Error de Red"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "No se pudo cargar el mapa"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error mientras cargaba %s"
@@ -435,23 +435,23 @@ msgstr "Cantidad:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Salir"
@@ -475,21 +475,21 @@ msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Contraseña:"
@@ -552,68 +552,73 @@ msgstr "La nueva contraseña debe tener como máximo %d caracteres."
 msgid "The new password entries mismatch."
 msgstr "Las nuevas contraseñas no concuerdan."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Crear Personaje"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nombre:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Color de cabello:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Peinado:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Crear"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Masculino"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Femenino"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor borra %d puntos"
@@ -655,9 +660,9 @@ msgstr "Ingrese la contraseña para borrar el personaje"
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Borrar"
 
@@ -732,7 +737,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -744,12 +749,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -914,7 +919,7 @@ msgstr "¿Sabías que...?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
@@ -930,11 +935,36 @@ msgstr "Siguiente >"
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Puerto:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamiento"
@@ -1032,39 +1062,39 @@ msgstr "Recuperar"
 msgid "Drop"
 msgstr "Tirar"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Todo"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Seleccione la cantidad de objetos a intercambiar."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de objetos a tirar."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Seleccione la cantidad de artículos a recuperar."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de objetos para dividir."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Agregar a las compras de la tienda."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Agregar a las ventas de la tienda."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -1181,32 +1211,31 @@ msgstr "Cerrar automáticamente"
 msgid "Skip"
 msgstr "Saltar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Actualizar:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
@@ -1283,12 +1312,12 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Conjuntos: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1694,64 +1723,58 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Escoge  tu servidor"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Puerto:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Tipo de servidor:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Servidor propio"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Añadir"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Por favor especifique el nombre y el puerto del servidor."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "requiere una versión mas nueva"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -2317,23 +2340,23 @@ msgstr "En la lista negra"
 msgid "Enemy"
 msgstr "Enemigo"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Permitir intercambios"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Viejo"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Relaciones"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
@@ -2461,8 +2484,8 @@ msgstr "Tamaño de fuente"
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el juego para que los cambios tengan efecto."
 
@@ -2514,151 +2537,150 @@ msgstr "medio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Mostrar aviso al coger algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "en el chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Límite FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Límite FPS alternativo: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Sobrecarga de texto"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Opacidad de interfaz"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Detalle de partículas"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Los cambios tendrán efecto cuando se cambie de mapa."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Comprar artículos"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Vender artículos"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Añadir"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Anunciar"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en anuncio"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Subasta"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
@@ -2800,12 +2822,12 @@ msgstr "Invitar"
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/socialwindow.cpp:1277
 msgid "P"
-msgstr ""
+msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1281
 msgid "F"
-msgstr ""
+msgstr "A"
 
 #: src/gui/socialwindow.cpp:1414
 #, c-format
@@ -3263,23 +3285,23 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3420,10 +3442,6 @@ msgstr "/leave > Dejar el clan en el que estás"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsar a alguien del clan en el que estás."
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignorar a otro jugador"
@@ -3676,7 +3694,7 @@ msgstr "Tecla de acceso directo de objeto"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atajo para el objeto %d"
@@ -3803,184 +3821,186 @@ msgstr "Emoticono"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atajo para Emoticono %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Teclas de Conjuntos"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo que tiene equipado a Conjunto"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Teclas del Chat"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Cambiar Chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Desplazarse hacia arriba en el chat"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Desplazarse hacia abajo en el chat"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña del Chat"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Completar texto automáticamente en chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Desactivar entrada al Chat"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Arriba"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Abajo"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Movimientos locos"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Cambiar  el tipo de movimientos locos"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lanzamiento de N objetos desde 0 casillas"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Dejar caer N artículos rápidamente"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Intercambiar ataque mágico"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Intercambiar ataque pvp"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Cambiar tipo de maniobra"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Cambiar modo de perseguir"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de Imitación"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar las teclas de modificación del Juego"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Interruptor de tipo de cámara"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Tecla modificadora"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3989,340 +4009,340 @@ msgstr ""
 "Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimiento loco número %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) atacar a los que no son amigos"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) no atacar a los jugadores"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Imitación: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Ves "
 
 #: src/main.cpp:50
 msgid "manaplus [options] [manaplus-file]"
-msgstr "manaplus [options] [manaplus-file]"
+msgstr "manaplus [opciones] [manaplus-file]"
 
 #: src/main.cpp:51
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
diff --git a/po/fi.po b/po/fi.po
index 2ab7d810e..23565a9d1 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-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -32,122 +32,122 @@ msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "-"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Tehokkuus"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -156,160 +156,160 @@ msgstr ""
 "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
 "käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "ystävä"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutraali"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "mustalistattu"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "vihollinen"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -320,43 +320,43 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -432,23 +432,23 @@ msgstr "Määrä:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Sulje"
@@ -472,21 +472,21 @@ msgid "Sell"
 msgstr "Myy"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Salasana:"
@@ -549,68 +549,73 @@ msgstr "Uuden salasanan enimmäispituus on %d merkkiä."
 msgid "The new password entries mismatch."
 msgstr "Uuden salasanan kopiot eivät täsmää."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Luo hahmo"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nimi:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Rotu: "
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Luo"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -652,9 +657,9 @@ msgstr "Anna salasana hahmon poistamiseksi"
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Poista"
 
@@ -729,7 +734,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -741,12 +746,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -911,7 +916,7 @@ msgstr "Tiesitkö?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
@@ -927,11 +932,36 @@ msgstr "Seuraava >"
 msgid "Auto open this window"
 msgstr "Avaa tämä ikkuna automaattisesti"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Portti:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Palvelintyyppi:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Varusteet"
@@ -1029,39 +1059,39 @@ msgstr "Ota"
 msgid "Drop"
 msgstr "Pudota"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Kaikki"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -1178,32 +1208,31 @@ msgstr "Sulje kun valmis"
 msgid "Skip"
 msgstr "Ohita"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Käytä omaa päivityspalvelinta"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Päivitys:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
@@ -1280,12 +1309,12 @@ msgstr "Lähetä"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Asu: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1691,64 +1720,58 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Portti:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Palvelintyyppi:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Muu palvelin"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Lisää"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Muokkaa"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -2315,23 +2338,23 @@ msgstr "Mustalla listalla"
 msgid "Enemy"
 msgstr "Vihollinen"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Vanha"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Suhteet"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
@@ -2459,8 +2482,8 @@ msgstr "Kirjasimen koko"
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -2512,149 +2535,148 @@ msgstr "keskitaso"
 msgid "max"
 msgstr "maksimi"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Näytä poimintaviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "leijuvana"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Tekstinä yläpuolella"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Osta tavaroita"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Myy tavaroita"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Lisää"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Ilmoita"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Huutokauppa"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
@@ -3257,23 +3279,23 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3414,10 +3436,6 @@ msgstr "/leave > Eroa nykyisestä killastasi"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Poista käyttäjä killastasi"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Muokkaa"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Jätä pelaaja huomiotta"
@@ -3671,7 +3689,7 @@ msgstr "Tavaroiden pikavalintanäppäin"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tavarapikavalinta %d"
@@ -3798,184 +3816,186 @@ msgstr "Hymiö"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Eleen pikavalinta %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Asunäppäimet"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Pue asu"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Kopioi varusteet asuksi"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Keskustelunäppäimet"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Vieritä keskustelua ylös"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Vieritä keskustelua alas"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Sulje tämä keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Edellinen keskustelulinja"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Seuraava keskustelulinja"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Sarkaintäydennys keskustelussa"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Poistu keskustelusyötöstä"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Muut näppäimet"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Jätä huomiotta syöte 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Jätä huomiotta syöte 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Vie ylös"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Vie alas"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Vie vasemmalle"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Vie oikealle"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Villiliikkeet"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Muuta villiliiketilaa"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Pudota nopeasti N esinettä paikasta 0"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Pudota nopeasti N esinettä"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Vaihda nopean pudotuksen laskuria"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Pikaparanna kohde tai itse"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Käytä #itenplz-loitsua"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Käytä magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Vaihda magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Vaihda PvP-hyökkäystä"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Vaihda liikkumistyyppiä"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Vaihda hyökkäysaseen tyyppiä"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Vaihda hyökkäystyyppiä"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Vaihda seuraustyyliä"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Vaihda matkintatyyliä"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Ota käyttöön / poista pelimuokkaimet"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Äänet päälle / pois"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Aseta / peru poissaolo"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Vaihda kameran toimintaa"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Muokkausnäppäin"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3984,334 +4004,334 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) villiliike nro %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) säästä ystävät, listi muut"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) älä hyökkää pelaajien kimppuun"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Näet "
 
diff --git a/po/fr.po b/po/fr.po
index ac2456f68..9e4b75628 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
@@ -37,123 +37,123 @@ msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages vides."
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -162,161 +162,161 @@ msgstr ""
 "Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
 "\". Soit elle existe déjà, soit il s'agit de vous même."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "sous liste noire"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "ennemi"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -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:405
+#: src/game.cpp:254 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:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Informations"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée sous"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "La sauvegarde de la capture d'écran a échoué !"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 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:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "La carte n'a pu être chargée"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erreur durant le chargement %s"
@@ -439,23 +439,23 @@ msgstr "Montant:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Quitter"
@@ -479,21 +479,21 @@ msgid "Sell"
 msgstr "Vendre"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -556,68 +556,73 @@ msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
 msgid "The new password entries mismatch."
 msgstr "Les nouveaux mots de passe ne correspondent pas."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Créer le personnage"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nom :"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Couleur :"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Coupe :"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Race:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Créer"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Masculin"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Féminin"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
@@ -659,9 +664,9 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -736,7 +741,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -748,12 +753,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -918,7 +923,7 @@ msgstr "Le saviez-vous ?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
@@ -934,11 +939,36 @@ msgstr "Suivant >"
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port :"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Type de Serveur :"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Équipement"
@@ -1036,39 +1066,39 @@ msgstr "Récupérer"
 msgid "Drop"
 msgstr "Jeter"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tout"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Choisir le nombre d'objets à jeter."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -1185,32 +1215,31 @@ msgstr "Fermeture automatique"
 msgid "Skip"
 msgstr "Sauter"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Compte"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Serveur de mise à jour personnalisé"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Mise à jour : "
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
@@ -1287,12 +1316,12 @@ msgstr "Envoyer"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1698,64 +1727,58 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisissez votre serveur  *** Mode Sûr ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port :"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Type de Serveur :"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Serveur personnalisé"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Ajouter"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Veuillez entrer l'adresse et le port du serveur."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Éditer"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -2322,23 +2345,23 @@ msgstr "Sous liste noir"
 msgid "Enemy"
 msgstr "Ennemi"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Ancien"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Relations"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
@@ -2466,8 +2489,8 @@ msgstr "Taille de police"
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2519,156 +2542,155 @@ msgstr "moyen"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "dans la conversation"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Rien"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
 "également pas accessible !"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Boutique personnelle"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Acheter des objets"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Vendre des objets"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Ajouter"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Annoncer"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Enchère"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
@@ -3277,23 +3299,23 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3438,10 +3460,6 @@ msgstr "/leave > Quitter la guilde courante"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Éditer"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignore l'autre joueur"
@@ -3694,7 +3712,7 @@ msgstr "Touche de raccourcis items"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Raccourci Objet %d"
@@ -3821,184 +3839,186 @@ msgstr "Smileys"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'émoticône %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Touches d'habillages"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Mettre la tenue"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Copier l'équipement porté dans les tenues"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Touches de la boite de dialogue"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Onglet de conversation précédent"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Fermer la fenêtre de dialogue ouverte"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Ligne de conversation précédente"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Ligne de conversation suivante"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Auto complétion du chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Désactiver la saisie dans le chat"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Autre touches"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Vers le haut"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Vers le bas"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Vers la gauche"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Vers la droite"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Mouvements de fous"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Changer le mode de mouvement de fou"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Jeter rapidement N objets"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Changer de compteur de jet rapide d'objets"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Soins rapides de la cible ou de soi"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Utiliser le sort #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Utiliser l'attaque magique"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Changer d'attaque magique"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Commutateur d'attaque en PVP"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Changer de type de mouvement"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Changer de type d'arme d'attaque"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Changer de type d'attaque"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Changer de type de suivi"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Changer de type d'imitation"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Désactiver / Activer les touches de modifications du jeu"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Son On / Off"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver le mode en absence"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Emuler le clic droit à partir du clavier"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Changer le mode caméra"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Modifier la touche"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4007,334 +4027,334 @@ 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:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Tu as été tué par %s"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnue"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) mouvement de fou numerique %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) Portée des attaques des Archéens"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) attaque tous les joueurs"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) n'attaque pas des amis"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Vous voyez  "
 
diff --git a/po/id.po b/po/id.po
index 05ea93539..46c380631 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
 "id/)\n"
@@ -34,122 +34,122 @@ msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,155 +158,155 @@ msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "Teman"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "netral"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -316,43 +316,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error ketika menunggu %s"
@@ -428,23 +428,23 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Keluar"
@@ -468,21 +468,21 @@ msgid "Sell"
 msgstr "Jual"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Kata Sandi:"
@@ -545,68 +545,73 @@ msgstr "Password baru harus kurang dari %d karakter."
 msgid "The new password entries mismatch."
 msgstr "Password baru yang dimasukkan tidak cocok."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Buat Karakter"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nama:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Warna rambut"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Gaya rambut"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Laki-laki"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Perempuan"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter"
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -648,9 +653,9 @@ msgstr "Masukan Sandi untuk menghapus karakter"
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Hapus"
 
@@ -725,7 +730,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -737,12 +742,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -907,7 +912,7 @@ msgstr "Apakah kamu tahu?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
@@ -923,11 +928,36 @@ msgstr "Selanjutnya"
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Tipe server:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Perlengkapan"
@@ -1025,39 +1055,39 @@ msgstr "Kembalikan"
 msgid "Drop"
 msgstr "Buang"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Semua"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Tidak diketahui"
 
@@ -1172,32 +1202,31 @@ msgstr "Tutup otomatis"
 msgid "Skip"
 msgstr "lanjutkan"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Modifikasi sumber update"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Ingat username"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Menganti Server"
 
@@ -1274,12 +1303,12 @@ msgstr "Kirim"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1685,64 +1714,58 @@ msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
 msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Tipe server:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Memuat"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Menyambung"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Modifikasi server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Tambah"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Tolong tulis address dan port dari server"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Ganti"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -2306,23 +2329,23 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Perbolehkan penukaran"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Perbolehkan berbisik"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Lama"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
@@ -2450,8 +2473,8 @@ msgstr "Ukuran huruf"
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -2503,148 +2526,147 @@ msgstr "sedang"
 msgid "max"
 msgstr "maksimal"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Efek partikel"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Perlihatkan notifikasi pengambilan item"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "dalam obrolan"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "sebagai partikel"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Detil partikel"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Pengaturan efek partikel diubah"
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Perubahan akan memberikan efek saat pergantian peta."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Toko personal"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Beli barang"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Jual barang"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Tambah"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Umumkan"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
@@ -3247,23 +3269,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3402,10 +3424,6 @@ msgstr ""
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Ganti"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3656,7 +3674,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
@@ -3783,517 +3801,519 @@ msgstr ""
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Salin barang-barang yang dipakai ke Setelan"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Tutup tab obrolan ini"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Garis obrolan sebelumnya"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Garis obrolan selanjutnya"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Kunci pengubah"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 4439e91cb..ebe36c37b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -34,122 +34,122 @@ msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Accesso all'account"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Cambia password"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Cambia Email"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -158,160 +158,160 @@ msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "Neutrale"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -322,43 +322,43 @@ msgstr ""
 "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
 "(falso), \"1\", \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -434,23 +434,23 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Esci"
@@ -474,21 +474,21 @@ msgid "Sell"
 msgstr "Vendi"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -524,7 +524,7 @@ msgstr "Gli indirizzi email immessi non coincidono."
 msgid "Change Password"
 msgstr "Cambia la Password"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Password:"
@@ -551,68 +551,73 @@ msgstr "La nuova password deve essere più corta di %d caratteri."
 msgid "The new password entries mismatch."
 msgstr "Le password immesse non coincidono."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Crea Personaggio"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Crea"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Maschio"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Femmina"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -654,9 +659,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Elimina"
 
@@ -731,7 +736,7 @@ msgstr "Arcobaleno 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -743,12 +748,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -913,7 +918,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
@@ -929,11 +934,36 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Porta:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Tipo di server:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipaggiamento"
@@ -1031,39 +1061,39 @@ msgstr "Recupera"
 msgid "Drop"
 msgstr "Lascia"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tutti"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Sconosciuto"
 
@@ -1180,32 +1210,31 @@ msgstr "Chiusura automatica"
 msgid "Skip"
 msgstr "Salta"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Aggiornamento host"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Ricorda username"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Aggiornamento:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Cambia server"
 
@@ -1282,12 +1311,12 @@ msgstr "Invia"
 msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Outfit: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1693,64 +1722,58 @@ msgstr "La password deve contenere meno di %d caratteri."
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Tipo di server:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Carica"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Connetti"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Server personalizzati"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Aggiungi"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Inserire l'indirizzo e la porta del server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Modifica"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Preparazione download"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -2316,23 +2339,23 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Vecchio"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
@@ -2460,8 +2483,8 @@ msgstr "Dimensione caratteri"
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -2513,154 +2536,153 @@ msgstr "medio"
 msgid "max"
 msgstr "massimo"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Effetti particelle"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Mostra notifica pickup"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "come particelle"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Limite Alt FPS:  "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Testo sovrastante"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Dettaglio particelle"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Nessuno"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Cambio verso la modalità finestra fallito e anche il ripristino modalità "
 "precedente è fallito!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Cambio verso la modalità schermo intero fallito e anche il ripristino della "
 "modalità precedente è fallito!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Cambiamento a schermo intero"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Cambiamento a OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Risoluzione scelta (esempio 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Nuova risoluzione:                                         "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "RIsoluzione schermo cambiata"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
 "ridotta"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Impostazioni effetti particelle cambiate."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "I cambi saranno effettuati al cambio della mappa."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Compra oggetti"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Vendi oggetti"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Aggiungi"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Annuncia"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Mostra link nell'annuncio"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
@@ -3266,23 +3288,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Chi è online -   "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -3423,10 +3445,6 @@ msgstr ""
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Modifica"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora l'altro giocatore"
@@ -3681,7 +3699,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Scorciatoia %d"
@@ -3808,184 +3826,186 @@ msgstr ""
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Scorre la chat in alto"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Scorre la chat in basso"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Scheda Chat Precedente"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "On / Off audio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Abilita / Disabilita modalità away"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3994,334 +4014,334 @@ msgstr ""
 "Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
 "inconvenienti"
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante"
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "L'inventario è pieno"
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Hai raccolto %d  [@@%d|%s@@]."
 msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Assente"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index b4b7bb429..0fd12ff43 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
@@ -36,122 +36,122 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "ログインしています"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "不明なコマンドです"
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "空のささやきを送信することはできません"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,155 +160,155 @@ msgstr ""
 "%sへのささやきタブの作成に失敗しました。そのタブは既に開いている、もしくは自"
 "分宛てです"
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%sチャンネルへの参加をリクエスト中"
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "パーティ名がありません"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "ギルド名がありません"
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "名前を入力してください"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "チャットを閉じます"
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "改行キーでチャット入力ができます"
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "チャットを閉じます"
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "友達"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーは既に%s"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーの%sに成功しました"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%sできなかった"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
-msgstr "プレイヤーを無視できませんでした"
+msgstr "プレイヤーを完全無視できませんでした"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
-msgstr "プレイヤーを無視解除しました"
+msgstr "プレイヤーを完全無視解除しました"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
-msgstr "プレイヤーを無視解除できませんでした"
+msgstr "プレイヤーを完全無視解除できませんでした"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "ブラックリスト化されています"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "敵"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "プレイヤーは削除されています"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "プレイヤーを削除しました"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d週"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d日"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "フォントキャッシュサイズ"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "キャッシュサイズ:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "作成:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "削除:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
@@ -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:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr " としてスクリーンショットを保存しました"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました"
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "トレードリクエストを無効にしています"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "マップの読み込みに失敗しました"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sの読み込み中にエラーが起きました"
@@ -430,23 +430,23 @@ msgstr "量:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "終了"
@@ -470,21 +470,21 @@ msgid "Sell"
 msgstr "売る"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -520,7 +520,7 @@ msgstr "メールアドレスが一致しません"
 msgid "Change Password"
 msgstr "パスワードの変更"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "パスワード:"
@@ -547,68 +547,73 @@ msgstr "パスワードは%d文字以下でなくてはいけません"
 msgid "The new password entries mismatch."
 msgstr "新しいパスワードが一致しません"
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "キャラクター作成"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名前:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "髪色:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "ヘアスタイル"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "人種:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男性"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女性"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です"
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -650,9 +655,9 @@ msgstr "キャラクターを削除するにはパスワードを入力して下
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "削除"
 
@@ -727,7 +732,7 @@ msgstr "虹 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -739,12 +744,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "チャット"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -765,7 +770,7 @@ msgstr "いいえ"
 #: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701
 #: src/gui/popupmenu.cpp:715
 msgid "Ignore"
-msgstr "無視"
+msgstr "完全無視"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
 #: src/gui/setup_other.cpp:64
@@ -886,7 +891,7 @@ msgstr "最高ヒット:"
 #: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
 #: src/gui/debugwindow.cpp:353
 msgid "Critical hit:"
-msgstr "致命的ヒット:"
+msgstr "クリティカルヒット:"
 
 #: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
 #, c-format
@@ -909,7 +914,7 @@ msgstr "豆知識"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
@@ -925,11 +930,36 @@ msgstr "次へ >"
 msgid "Auto open this window"
 msgstr "この窓を自動で開ける"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "ポート:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "サーバータイプ:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装着品"
@@ -1027,39 +1057,39 @@ msgstr "取出す"
 msgid "Drop"
 msgstr "落とす"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全て"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "購入リストに追加"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "販売リストに追加"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "不明"
 
@@ -1174,32 +1204,31 @@ msgstr "自動で閉じる"
 msgid "Skip"
 msgstr "スキップ"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "ログイン"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "サーバー:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "カスタムアップデートホスト"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "ユーザー名を記憶する"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "アップデート:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "登録"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "サーバー変更"
 
@@ -1276,12 +1305,12 @@ msgstr "送信する"
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました"
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "服装: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1361,7 +1390,7 @@ msgstr "消す"
 #: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721
 #: src/gui/popupmenu.cpp:726
 msgid "Unignore"
-msgstr "無視解除"
+msgstr "完全無視解除"
 
 #: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
 #: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
@@ -1456,7 +1485,7 @@ msgstr "攻撃リストへ追加する"
 
 #: src/gui/popupmenu.cpp:332
 msgid "Add to ignore list"
-msgstr "無視リストへ追加する"
+msgstr "完全無視リストへ追加する"
 
 #: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
 msgid "Add name to chat"
@@ -1687,64 +1716,58 @@ msgstr "パスワードは%d文字以下でなくてはいけません"
 msgid "Passwords do not match."
 msgstr "パスワードが一致しません"
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "ポート:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "サーバータイプ:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "読込み"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "ログイン"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "カスタムサーバー"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "追加"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "サーバのアドレスとポートを入力してください"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "編集"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています"
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -2294,11 +2317,11 @@ msgstr "友達"
 
 #: src/gui/setup_relations.cpp:72
 msgid "Disregarded"
-msgstr "無視"
+msgstr "無視している"
 
 #: src/gui/setup_relations.cpp:73
 msgid "Ignored"
-msgstr "無視する"
+msgstr "完全無視している"
 
 #: src/gui/setup_relations.cpp:74
 msgid "Erased"
@@ -2312,25 +2335,25 @@ msgstr "ブラックリスト化されています"
 msgid "Enemy"
 msgstr "敵"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "トレードを受付ける"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "全てのささやきを受け取る"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "古い"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "関係"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
-msgstr "無視の際には:"
+msgstr "完全無視の際には:"
 
 #: src/gui/setup_theme.cpp:108
 msgid "Tiny (10)"
@@ -2456,8 +2479,8 @@ msgstr "フォントサイズ"
 msgid "Theme Changed"
 msgstr "テーマを変更しました"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください"
 
@@ -2509,148 +2532,147 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "フールスクリーン"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "パーティクル効果"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "収集通知表示"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "チャットで"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "画面内で"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "FPSリミット:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "ヘッダーテキスト"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "GUI不透明"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "環境FX"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "パーティクルの詳細"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "なし"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード、また前モードの復元にも失敗しました"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード、また前モードの復元にも失敗しました"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更の為、再起動をしてください"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください。"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度 (例: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "解像度を入力して下さい:                "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度を変更しました"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "パーティクル効果の設定を変更しました"
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "変更はマップが変わった時に有効になります"
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "購入"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "販売"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "追加"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "アナウンス"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "オークション"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
@@ -2759,7 +2781,7 @@ msgstr "ナビ"
 
 #: src/gui/socialwindow.cpp:927
 msgid "Atk"
-msgstr "Atk"
+msgstr "攻撃"
 
 #: src/gui/socialwindow.cpp:968
 msgid "Priority mobs"
@@ -2771,7 +2793,7 @@ msgstr "敵を攻撃する"
 
 #: src/gui/socialwindow.cpp:1035
 msgid "Ignore mobs"
-msgstr "敵を無視する"
+msgstr "敵を完全無視する"
 
 #: src/gui/socialwindow.cpp:1195
 msgid "Create Guild"
@@ -2792,12 +2814,12 @@ msgstr "招待"
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/socialwindow.cpp:1277
 msgid "P"
-msgstr ""
+msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1281
 msgid "F"
-msgstr ""
+msgstr "フレ"
 
 #: src/gui/socialwindow.cpp:1414
 #, c-format
@@ -3109,7 +3131,7 @@ msgstr "完了"
 
 #: src/gui/userpalette.cpp:116
 msgid "Being"
-msgstr "人"
+msgstr "プレイヤー"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
@@ -3121,7 +3143,7 @@ msgstr "無視している名前"
 
 #: src/gui/userpalette.cpp:119
 msgid "Ignored Names"
-msgstr "無視している名前"
+msgstr "完全無視している名前"
 
 #: src/gui/userpalette.cpp:120
 msgid "Erased Names"
@@ -3181,15 +3203,15 @@ msgstr "プレイヤーのHPバー（二番目の色）"
 
 #: src/gui/userpalette.cpp:137
 msgid "Player Hits Monster"
-msgstr "プレイヤーはモンスターをヒット"
+msgstr "プレイヤーがモンスターをヒットした時"
 
 #: src/gui/userpalette.cpp:138
 msgid "Monster Hits Player"
-msgstr "モンスターはプレイヤーをヒット"
+msgstr "モンスターがプレイヤーをヒットした時"
 
 #: src/gui/userpalette.cpp:140
 msgid "Other Player Hits Local Player"
-msgstr "他のプレイヤーがローカルプレイヤーを攻撃しました"
+msgstr "他のプレイヤーがローカルプレイヤーを攻撃した時"
 
 #: src/gui/userpalette.cpp:141
 msgid "Critical Hit"
@@ -3197,11 +3219,11 @@ msgstr "クリティカルヒット"
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Hits Monster"
-msgstr "ローカルプレイヤーがモンスターを攻撃しました"
+msgstr "ローカルプレイヤーがモンスターを攻撃した時"
 
 #: src/gui/userpalette.cpp:145
 msgid "Local Player Critical Hit"
-msgstr "ローカルプレイヤー　会心の一撃"
+msgstr "ローカルプレイヤー　クリティカルヒットした時"
 
 #: src/gui/userpalette.cpp:147
 msgid "Local Player Miss"
@@ -3255,23 +3277,23 @@ msgstr "ホームボーダー"
 msgid "Road Point"
 msgstr "ロードポイント"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -3414,13 +3436,9 @@ msgstr "/leave > ギルドから退会する"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > プレイヤーをギルドから追い出します"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "編集"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
-msgstr "/ignore > 他のプレイヤーを無視する"
+msgstr "/ignore > 他のプレイヤーを完全無視する"
 
 #: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
@@ -3444,7 +3462,7 @@ msgstr "コマンド: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr "このコマンドは全てのプレイヤーを無視します"
+msgstr "このコマンドは全てのプレイヤーを完全無視します"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3452,7 +3470,7 @@ msgstr "コマンド: /unignore <プレイヤー名>"
 
 #: src/gui/widgets/whispertab.cpp:131
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "このコマンドはプレイヤー無視を解除します"
+msgstr "このコマンドはプレイヤー完全無視を解除します"
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3668,7 +3686,7 @@ msgstr "アイテムショートカットキー"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
@@ -3795,184 +3813,186 @@ msgstr "スマイリー"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "服装キー"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "服を着る"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "装着品を服装にコピー"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "チャットキー"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "チャットを上へスクロールする"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "チャットを下へスクロールする"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "このチャットタブを閉じる"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "前チャット文"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "次チャット文"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "チャットオートコンプリート"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "チャット入力無効"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "その他のキー"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
-msgstr "インプット１無視"
+msgstr "インプット１完全無視"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
-msgstr "インプット２無視"
+msgstr "インプット２完全無視"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "上方向"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "下方向"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "左方向"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "右方向"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "クレイジームーブ"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "クレイジームーブモード変更"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Nアイテムを 0スロットからクイックドロップ"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Nアイテムをクイックドロップ"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "クイックドロップカウンター変更"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "ターゲット又は自分をHP回復させる"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "呪文 #itenplz を唱える"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "マジックアタック変更"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "PvP攻撃変更"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "ムーブタイプ変更"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "武器変更"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "攻撃方法変更"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "フォローモード変更"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "真似モード変更"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "ゲームモディファイアキーを無効 / 有効にする"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "オーディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "AFKモードを有効 / 無効にする"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "右クリックをエミュレートする"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "カメラモード変更"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "モディファイアーキー"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3981,333 +4001,333 @@ msgstr ""
 "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
 "ん。"
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "%sによって殺されました"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます"
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です"
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "量が多すぎます"
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです"
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) 友達以外を攻撃"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "アウェイ"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイアー"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "フォロー: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "真似: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr " が見える"
 
@@ -4511,7 +4531,7 @@ msgstr "%sがオフラインの為ささやきは送れませんでした"
 #: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "%sが無視設定をしている為ささやきは送れませんでした"
+msgstr "%sが完全無視設定をしている為ささやきは送れませんでした"
 
 #: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 91737f2b7..8cc4c1234 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-01-25 20:17+0300\n"
+"POT-Creation-Date: 2012-02-02 16:43+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"
@@ -31,282 +31,282 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -315,43 +315,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
@@ -427,23 +427,23 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr ""
@@ -467,21 +467,21 @@ msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr ""
 
@@ -517,7 +517,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -544,68 +544,73 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -647,9 +652,9 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr ""
 
@@ -724,7 +729,7 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -736,12 +741,12 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -906,7 +911,7 @@ msgstr ""
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -922,11 +927,36 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
@@ -1024,39 +1054,39 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
@@ -1173,32 +1203,31 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr ""
 
@@ -1275,12 +1304,12 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1686,64 +1715,58 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -2307,23 +2330,23 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr ""
 
@@ -2451,8 +2474,8 @@ msgstr ""
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2504,148 +2527,147 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr ""
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -3248,23 +3270,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3403,10 +3425,6 @@ msgstr ""
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3657,7 +3675,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
@@ -3784,518 +3802,520 @@ msgstr ""
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 0d1cb855e..4fd61764d 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-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+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"
@@ -33,122 +33,122 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,160 +157,160 @@ msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "vriend"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "genegeerd"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutraal"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Speler succesvol verwijderd!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Aangemaakt:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -320,43 +320,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Scherafdruk opgeslagen als:"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Kon Map Niet Laden"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
@@ -432,23 +432,23 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Afsluiten"
@@ -472,21 +472,21 @@ msgid "Sell"
 msgstr "Verkopen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -549,68 +549,73 @@ msgstr "Het nieuw paswoord mag niet meer dan %d karakters bevatten."
 msgid "The new password entries mismatch."
 msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Personage Aanmaken"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Naam:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Ras:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mannelijk"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -652,9 +657,9 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -729,7 +734,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -741,12 +746,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -911,7 +916,7 @@ msgstr "Weet u?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -927,11 +932,36 @@ msgstr "Volgend >"
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Poort:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Server type:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Uitrusting"
@@ -1029,39 +1059,39 @@ msgstr "Afhalen"
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -1178,32 +1208,31 @@ msgstr "Auto Sluiten"
 msgid "Skip"
 msgstr "Overslaan"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Manuele update server"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Onthoud gebruikersnaam"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Wijzig Server"
 
@@ -1280,12 +1309,12 @@ msgstr "Verzenden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1691,64 +1720,58 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Poort:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Server type:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Verbinden"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Manuele Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Toevoegen"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Typ aub zowel het adres van de server, als de poort."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Wijzig"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -2314,23 +2337,23 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Oud"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Relaties"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
@@ -2458,8 +2481,8 @@ msgstr "Lettergrootte"
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2511,154 +2534,153 @@ msgstr "gemiddeld"
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Notificatie bij oprapen weergeven"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "in chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "als deeltje"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
 "faalde ook!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
 "modus faalde ook!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Wijzigingen treden in werking bij het wisselen van map."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Koop voorwerpen"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Verkoop voorwerpen"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Toevoegen"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Aankondigingen"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
@@ -3263,23 +3285,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -3424,10 +3446,6 @@ msgstr ""
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Wijzig"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Negeer de andere speler"
@@ -3681,7 +3699,7 @@ msgstr "Voorwerpsnelkoppelingstoets"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkoppeling naar voorwerp %d"
@@ -3808,518 +3826,520 @@ msgstr "Smilie"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Draag Kledij"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Kopiëer Kledij"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Snel N Voorwerpen van slot 0 neerleggen"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Aan / Uit audio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 1f2ee4bdc..fbc6ce4c0 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-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
 "pl/)\n"
@@ -34,122 +34,122 @@ msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Obraz"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Skórki"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Logowanie"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,105 +157,105 @@ msgid ""
 msgstr ""
 "Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Brak nazwy gildii."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "znajomy"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "lekceważony"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutralny"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "wróg"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Gracz usunięty z powodzeniem!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -263,7 +263,7 @@ msgstr[0] "%d tydzień"
 msgstr[1] "%d tygodni/e"
 msgstr[2] "%d tygodni/e"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -271,7 +271,7 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -279,7 +279,7 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godzin/y"
 msgstr[2] "%d godzin/y"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -287,7 +287,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minut/y"
 msgstr[2] "%d minut/y"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -295,27 +295,27 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekund/y"
 msgstr[2] "%d sekund/y"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "rozmiar cache czcionki"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Rozmiar cache:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Stworzono:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Usunięto:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
@@ -324,43 +324,43 @@ msgstr "Osierocone obrazy źródłowe:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 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:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany jako"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Nie można załadować mapy"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Błąd podczas łądowania %s"
@@ -436,23 +436,23 @@ msgstr "Ilość:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Wyjdź"
@@ -476,21 +476,21 @@ msgid "Sell"
 msgstr "Sprzedaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Hasło:"
@@ -553,68 +553,73 @@ msgstr "Nowe hasło może mieć najwyżej %d znaków."
 msgid "The new password entries mismatch."
 msgstr "Potwierdzenie hasła nie zgadza się."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Stwórz postać"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Imię:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Fryzura:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Rasa:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Utwórz"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kobieta"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -656,9 +661,9 @@ msgstr "Wprowadź hasło aby usunąć postać"
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Usuń"
 
@@ -733,7 +738,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -745,12 +750,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -915,7 +920,7 @@ msgstr "Cz wiesz że..."
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
@@ -931,11 +936,36 @@ msgstr "Dalej>"
 msgid "Auto open this window"
 msgstr "Otwieraj to okno automatycznie"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Typ serwera:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ekwipunek"
@@ -1033,39 +1063,39 @@ msgstr "Pobierz"
 msgid "Drop"
 msgstr "Upuść"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "wszystkie"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do odbioru."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Nieznany obiekt"
 
@@ -1184,32 +1214,31 @@ msgstr "Automatyczne zamykanie"
 msgid "Skip"
 msgstr "Omiń"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Zaawansowane ustawienia aktualizacji"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Zapamiętaj login"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Aktualizacja:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Zmień serwer"
 
@@ -1286,12 +1315,12 @@ msgstr "Wyślij"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Strój: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1697,64 +1726,58 @@ msgstr "Hasło nie może mieć więcej niż %d znaków."
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Typ serwera:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Załaduj"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Połącz"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Dodaj serwer"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Dodaj"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Proszę wpisać adres i port serwera"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Edycja"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -2318,23 +2341,23 @@ msgstr "Dodany/a do czarnej listy"
 msgid "Enemy"
 msgstr "Wróg"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Resetuj"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Relacje"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
@@ -2462,8 +2485,8 @@ msgstr "Rozmiar czcionki"
 msgid "Theme Changed"
 msgstr "Skórka zmieniona"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
@@ -2515,153 +2538,152 @@ msgstr "średnie"
 msgid "max"
 msgstr "najlepsze"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Pełny ekran"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Efekty cząsteczkowe"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Pokaż powiadomienie o podniesieniu"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "w czacie"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "jako cząsteczkę"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Alternatywny limit FPS:"
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Tekst nad głową"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Efekty otoczenia"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Detale cząsteczkowe"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Brak"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
 "stanu!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Zmiana na tryb pełnoekranowy"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Zmiana na OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Własna rozdzielczość (np. 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Wpisz nową rozdzielczość:"
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Rozdzielczość zmieniona"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Niektóre okna mogą być przesunięte aby dopasować się do niższej "
 "rozdzielczości."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Ustawienia efektów cząsteczkowych zmienione."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Kupuj"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Sprzedaj"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Ogłoś"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Pokazuj linki w ogłoszeniach"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Aukcja"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
@@ -3266,23 +3288,23 @@ msgstr "Obwódka lokalizacji domowej"
 msgid "Road Point"
 msgstr "Drogowskaz"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Gracze online- "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -3421,10 +3443,6 @@ msgstr "/leave > Opuść swoją gildię"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Wyrzuć kogoś ze swojej gildii"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Edycja"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignoruj gracza"
@@ -3675,7 +3693,7 @@ msgstr "Klawisz skrótu przedmiotu"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Skrót przedmiotu %d"
@@ -3802,184 +3820,186 @@ msgstr "Emotikonka"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Klawisze stroju"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Nałóż strój"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Kopiuj strój"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Skopiuj ekwipunek do stroju"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Klawisze czatu"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Zamknij bieżącą zakładkę czatu"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Poprzedni wiersz czatu"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Następny wiersz czatu"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Dopełnianie w czacie"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Wyłącz wpisywanie do czatu"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Inne"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Skieruj się w górę"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Skieruj się w dół"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Skieruj się w lewo"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Skieruj się w prawo"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Szalone ruchy"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Zmień tryb szalonych ruchów"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Szybkie upuszczenie N przedmiotów z pozycji 0"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Szybkie upuszczenie N przedmiotów"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Zmień licznik szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Szybkie leczenie celu lub siebie"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Użyj zaklęcia #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Użyj magicznego ataku"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Przełącz magiczny atak"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Przełącz atak PvP"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Zmień tryb poruszania się"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Zmień rodzaj broni"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Zmień rodzaj ataku"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Zmień rodzaj podążania"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Zmień rodzaj imitacji"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Włącz/ wyłącz klawisze modyfikatorów gry"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Włącz/ wyłącz dźwięk"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Włącz/ wyłącz tryb AFK"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Emuluj prawe kliknięcie klawiaturą"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Przełącz tryb kamery"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Klawisz modyfikatora"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3988,42 +4008,42 @@ msgstr ""
 "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
 "się problemy."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4031,292 +4051,292 @@ 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) szalone ruchy numer %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) atak"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) nie atakuj przyjaciół"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) nie atakuj nikogo"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "AFK"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) AFK"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) stan"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Widzisz "
 
diff --git a/po/pt.po b/po/pt.po
index b570120d5..474452b83 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
 "pt/)\n"
@@ -34,122 +34,122 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,160 +158,160 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "Inimigo"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -321,43 +321,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -433,23 +433,23 @@ msgstr "Quantidade:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Sair"
@@ -473,21 +473,21 @@ msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Senha:"
@@ -550,68 +550,73 @@ msgstr "A nova senha deve ter menos que %d caracteres."
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Criar Personagem"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -653,9 +658,9 @@ msgstr "Entre com a Senha para Deletar o usuario"
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
@@ -730,7 +735,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -742,12 +747,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -912,7 +917,7 @@ msgstr "Você sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -928,11 +933,36 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Porta:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
@@ -1030,39 +1060,39 @@ msgstr "Retirar"
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tudo"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -1179,32 +1209,31 @@ msgstr "Fechar"
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1281,12 +1310,12 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1692,64 +1721,58 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Tipo de servidor:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Servidor customizado"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Adicionar"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Por favor especifique o endereço e a porta do servidor."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -2314,23 +2337,23 @@ msgstr "Na Lista Negra "
 msgid "Enemy"
 msgstr "Inimigo"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Relações"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -2458,8 +2481,8 @@ msgstr "Tamanho da fonte"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2511,152 +2534,151 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Comprar itens"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Vender itens"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Adicionar"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Anúncio"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Leilão"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -2798,12 +2820,12 @@ msgstr "Convidar"
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/socialwindow.cpp:1277
 msgid "P"
-msgstr ""
+msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1281
 msgid "F"
-msgstr ""
+msgstr "A"
 
 #: src/gui/socialwindow.cpp:1414
 #, c-format
@@ -3260,23 +3282,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3416,10 +3438,6 @@ msgstr "/leave > Sai da guilda em que você está"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém da guilda em que você está"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
@@ -3671,7 +3689,7 @@ msgstr "Atalhos de item"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
@@ -3798,184 +3816,186 @@ msgstr "Emoticon"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Teclas de conversação"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Trocar ataque de pvp"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Modificar chave"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3984,334 +4004,334 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto por %s"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco numero %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) não atacar amigos"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Você vê "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f82ba68ac..ed3bc3a3b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+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"
@@ -36,122 +36,122 @@ msgid "miss"
 msgstr "por id"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "por peso"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "por quantidade"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "por tipo"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Habilitar rolagem preguisoça "
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Rolagem preguiçosa"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, 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:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +160,160 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "inimigo"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -323,43 +323,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Depurador"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Erro de conexão"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
@@ -435,23 +435,23 @@ msgstr "Quantidade:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Sair"
@@ -475,21 +475,21 @@ msgid "Sell"
 msgstr "Vender"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 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:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Senha:"
@@ -552,68 +552,73 @@ msgstr "A nova senha deve ter menos que %d caracteres."
 msgid "The new password entries mismatch."
 msgstr "As novas senhas não são iguais."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Criar Personagem"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Corrida:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -655,9 +660,9 @@ msgstr "Entre com a senha para apagar o personagem"
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Excluir"
 
@@ -732,7 +737,7 @@ 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/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: 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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -744,12 +749,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -914,7 +919,7 @@ msgstr "Você Sabia?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -930,11 +935,36 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Porta:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipamento"
@@ -1032,39 +1062,39 @@ msgstr "Retirar"
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tudo"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -1181,32 +1211,31 @@ msgstr "Fechar"
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1283,12 +1312,12 @@ msgstr "Enviar"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1694,64 +1723,58 @@ msgstr "A senha deve ser menor que %d caracteres."
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Tipo de servidor:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "Servidor customizado"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Adicionar"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Por favor especifique o endereço e a porta do servidor."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -2316,23 +2339,23 @@ msgstr "Na Lista Negra "
 msgid "Enemy"
 msgstr "Inimigo"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Relações"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -2460,8 +2483,8 @@ msgstr "Tamanho da fonte"
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2513,152 +2536,151 @@ msgstr "médio"
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "em chat"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "como partícula"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alt: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Texto sobrescrito como:"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Opacidade"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Comprar itens"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Vender itens"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Adicionar"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Anúncio"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Leilão"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
@@ -2800,12 +2822,12 @@ msgstr "Convidar"
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/socialwindow.cpp:1277
 msgid "P"
-msgstr ""
+msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1281
 msgid "F"
-msgstr ""
+msgstr "A"
 
 #: src/gui/socialwindow.cpp:1414
 #, c-format
@@ -3262,23 +3284,23 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3418,10 +3440,6 @@ msgstr "/leave > Sai da guilda em que você está"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém da guilda em que você está"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Editar"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
@@ -3673,7 +3691,7 @@ msgstr "Atalhos de item"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
@@ -3800,184 +3818,186 @@ msgstr "Emoticon"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Teclas de conversasão"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Mudar ataque em pvp"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Chave de modificação"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -3986,334 +4006,334 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto por %s"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 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:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco número %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) não atacar amigos"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Você vê "
 
diff --git a/po/ru.po b/po/ru.po
index 6beede284..7b9f7b797 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-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:28+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
@@ -36,122 +36,122 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "Производительность"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "Неизвестная команда."
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,105 +160,105 @@ msgstr ""
 "Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
 "уже создана, или этот игрок Вы сами."
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запрос на присоединение к каналу %s."
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "Не указано название группы"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "Не задано имя гильдии."
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr "добавлен в черный список"
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr "враг"
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -266,7 +266,7 @@ msgstr[0] "%d неделя"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -274,7 +274,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -282,7 +282,7 @@ msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -290,7 +290,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -298,27 +298,27 @@ msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -329,43 +329,43 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "Отладка"
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "Снимок экрана сохранен как "
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "Ошибка сети"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "Не удалось загрузить карту"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "Ошибка во время загрузки %s"
@@ -441,23 +441,23 @@ msgstr "Количество:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "Выход"
@@ -481,21 +481,21 @@ msgid "Sell"
 msgstr "Продать"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -531,7 +531,7 @@ msgstr "Адрес E-mail не совпадает"
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Пароль:"
@@ -558,68 +558,73 @@ msgstr "Пароль должен содержать менее %d символ�
 msgid "The new password entries mismatch."
 msgstr "Новый пароль не совпадает."
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "Создать персонажа"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr "Новый персонаж"
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Имя:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "Стрижка:"
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr "^"
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr "Раса:"
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Мужчина"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Женщина"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -661,9 +666,9 @@ msgstr "Введите пароль для удаления персонажа"
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "Удалить"
 
@@ -738,7 +743,7 @@ msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -750,12 +755,12 @@ msgstr "???"
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -920,7 +925,7 @@ msgstr "Вы знаете?"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
@@ -936,11 +941,36 @@ msgstr "Следующий >"
 msgid "Auto open this window"
 msgstr "Автоматически открывать это окно"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr "Редактирование сервера"
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr "Адрес:"
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Порт:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "Тип:"
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr "Описание:"
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr "Пожалуйста введите хотябы адрес и порт сервера"
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Снаряжение"
@@ -1038,39 +1068,39 @@ msgstr "Получить"
 msgid "Drop"
 msgstr "Бросить"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Всё"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -1189,32 +1219,31 @@ msgstr "Авт. закрыть"
 msgid "Skip"
 msgstr "Пропустить"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "Польз. сайт обновлений"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "Запомнить логин"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "Обновления:"
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "Сменить сервер"
 
@@ -1291,12 +1320,12 @@ msgstr "Отправить"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1702,64 +1731,58 @@ msgstr "Пароль не должен содержать более %d симв
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Порт:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "Тип:"
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "Соединиться"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Следует указать адрес и порт сервера."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "Изменить"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -2329,23 +2352,23 @@ msgstr "В черном списке"
 msgid "Enemy"
 msgstr "Враг"
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "Старые"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "Связи"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "Когда игнорируется:"
 
@@ -2473,8 +2496,8 @@ msgstr "Размер шрифта"
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
 
@@ -2526,154 +2549,153 @@ msgstr "средне"
 msgid "max"
 msgstr "макс."
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "Показать уведомление о подборе предмета"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "в чате"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "как частицу"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr "Разрешить менять размер окна"
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "Текст над головами"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Непрозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "Детализация частиц"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "Нет"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в оконный режим. Восстановить старый режим также не "
 "удалось!"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
 "также не удалось!"
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "Новое разрешение:                   "
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "Настройки эффектов частиц изменены."
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "Изменения вступят в силу после загрузки новой карты."
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "Купить"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "Продать"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Добавить"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "Анонс"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "Аукцион"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
@@ -3278,23 +3300,23 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3434,10 +3456,6 @@ msgstr "/leave > Покинуть текущую гильдию"
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "Изменить"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Игнорировать другого игрока"
@@ -3690,7 +3708,7 @@ msgstr "Горячие клавиши предметов"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Комбинация клавиш быстрого предмета %d"
@@ -3817,184 +3835,186 @@ msgstr "Смайлы"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинация клавиш для смайла %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "Клавиши нарядов"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "Надеть наряд"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr "Копировать наряд"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr "Копирование надетого наряда"
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "Клавиши чата"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "Прокручивание чата вверх"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "Прокручивание чата вниз"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "Предыдущая закладка чата"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "Следующая закладка чата"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "Закрыть текущую вкладку чата"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr "Предыдущая строка чата"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr "Следующая строка чата"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "Автозавершение в чате"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "Отключение фокуса ввода"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "Игнорирование ввода 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "Игнорирование ввода 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "Повернуться вверх"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "Повернуться вниз"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "Повернуться влево"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "Повернуться вправо"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "Сумасшедшие движения"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "Поменять режим сумасшедших движений"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Быстрый сброс N предметов из 0 слота"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "Быстрый сброс N предметов"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr "Переключение счётчика быстрого сброса"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "Быстрое лечения себя или цели"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr "Использование заклинания #itenplz"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "Использование магической атаки"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "Переключение маг. атаки"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr "Переключение pvp атаки"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "Изменение типа движения"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "Измение типа атаки оружием"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "Изменение типа атаки"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "Изменение режима следования"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "Изменение режима имитации"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr "Включение / Выключение специальных модификаторов"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "Вкл. / Выкл. звука"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "Включение / Выключение режима отошел"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "Эмуляция правого клика с клавиатуры"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "Изменение режима камеры"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "Кнопка-модификатор"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4003,42 +4023,42 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
 "вести."
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr "Вас убил %s"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4046,292 +4066,292 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) сумасшедшее движение %d"
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr "(f) атаковать всех кроме друзей"
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr "(d) не атаковать игроков"
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "Вы видите "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c8b454e0c..753aa1df9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-25 20:17+0300\n"
-"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"POT-Creation-Date: 2012-02-02 16:43+0300\n"
+"PO-Revision-Date: 2012-02-02 13:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "team/zh_CN/)\n"
@@ -34,277 +34,277 @@ msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539
+#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:952 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:959 src/gui/setup_perfomance.cpp:48
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:959 src/gui/setup_video.cpp:315
+#: src/client.cpp:964 src/gui/setup_video.cpp:317
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:964
+#: src/client.cpp:969
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1046
+#: src/client.cpp:1051
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1077
+#: src/client.cpp:1082
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1110
+#: src/client.cpp:1115
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1211
+#: src/client.cpp:1216
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1242
+#: src/client.cpp:1251
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1261
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
+#: src/client.cpp:1304 src/client.cpp:1311 src/client.cpp:1445
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1311
+#: src/client.cpp:1320
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1337
+#: src/client.cpp:1346
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1338
+#: src/client.cpp:1347
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1357
+#: src/client.cpp:1366
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1358
+#: src/client.cpp:1367
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1378
+#: src/client.cpp:1387
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1379
+#: src/client.cpp:1388
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
-#: src/client.cpp:2064 src/client.cpp:2071
+#: src/client.cpp:1593 src/client.cpp:1626 src/client.cpp:1641
+#: src/client.cpp:2073 src/client.cpp:2080
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1770
+#: src/client.cpp:1779
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1804 src/client.cpp:1810
+#: src/client.cpp:1813 src/client.cpp:1819
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1831
+#: src/client.cpp:1840
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:332
+#: src/commandhandler.cpp:333
 msgid "Cannot send empty whispers!"
 msgstr "无法发送空白密语！"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法同 \"%s\" 建立一个私人谈话标签页！或者已经存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:366
+#: src/commandhandler.cpp:367
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频道%s。"
 
-#: src/commandhandler.cpp:382 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
 msgid "Party name is missing."
 msgstr "帮会名称缺失。"
 
-#: src/commandhandler.cpp:393
+#: src/commandhandler.cpp:394
 msgid "Guild name is missing."
 msgstr "公会名称是缺少的。"
 
-#: src/commandhandler.cpp:406 src/commandhandler.cpp:523
-#: src/commandhandler.cpp:564 src/commandhandler.cpp:604
+#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
+#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
 msgid "Please specify a name."
 msgstr "请指定一个名称。"
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:457
+#: src/commandhandler.cpp:458
 msgid "Message closes chat."
 msgstr "讯息关闭聊天。"
 
-#: src/commandhandler.cpp:468
+#: src/commandhandler.cpp:469
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切换聊天。"
 
-#: src/commandhandler.cpp:474
+#: src/commandhandler.cpp:475
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天。"
 
-#: src/commandhandler.cpp:502
+#: src/commandhandler.cpp:503
 msgid "friend"
 msgstr "朋友"
 
-#: src/commandhandler.cpp:507
+#: src/commandhandler.cpp:508
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:512
+#: src/commandhandler.cpp:513
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:531
+#: src/commandhandler.cpp:532
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
-#: src/commandhandler.cpp:545
+#: src/commandhandler.cpp:546
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
-#: src/commandhandler.cpp:553
+#: src/commandhandler.cpp:554
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s"
 
-#: src/commandhandler.cpp:576
+#: src/commandhandler.cpp:577
 msgid "Player wasn't ignored!"
 msgstr "是不能忽视的！"
 
-#: src/commandhandler.cpp:583
+#: src/commandhandler.cpp:584
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略！"
 
-#: src/commandhandler.cpp:585
+#: src/commandhandler.cpp:586
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
-#: src/commandhandler.cpp:591
+#: src/commandhandler.cpp:592
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:596
+#: src/commandhandler.cpp:597
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:611
+#: src/commandhandler.cpp:612
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
-#: src/commandhandler.cpp:622
+#: src/commandhandler.cpp:623
 msgid "Player successfully erased!"
 msgstr "玩家成功删除！"
 
-#: src/commandhandler.cpp:624
+#: src/commandhandler.cpp:625
 msgid "Player could not be erased!"
 msgstr "玩家无法删除！"
 
-#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
+#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:941
+#: src/commandhandler.cpp:948
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:950
+#: src/commandhandler.cpp:957
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:958
+#: src/commandhandler.cpp:965
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:966
+#: src/commandhandler.cpp:973
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:974
+#: src/commandhandler.cpp:981
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1053
+#: src/commandhandler.cpp:1060
 msgid "font cache size"
 msgstr "字体缓存大小"
 
-#: src/commandhandler.cpp:1065
+#: src/commandhandler.cpp:1072
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1069
+#: src/commandhandler.cpp:1076
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1071
+#: src/commandhandler.cpp:1078
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
+#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
+#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -313,43 +313,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:407
+#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:508
+#: src/game.cpp:510
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:516
+#: src/game.cpp:518
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:558
+#: src/game.cpp:560
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:559
+#: src/game.cpp:561
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:1270
+#: src/game.cpp:1273
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/game.cpp:1280
+#: src/game.cpp:1283
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/game.cpp:1786
+#: src/game.cpp:1797
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:1787
+#: src/game.cpp:1798
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
@@ -425,23 +425,23 @@ msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
 #: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
 #: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
 #: src/keyboardconfig.cpp:84
 msgid "Quit"
 msgstr "退出"
@@ -465,21 +465,21 @@ msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:105
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp: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/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:168
+#: 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/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
 msgid "Cancel"
 msgstr "取消"
 
@@ -515,7 +515,7 @@ msgstr "电子邮件地址不匹配。"
 msgid "Change Password"
 msgstr "更换密码"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密码："
@@ -542,68 +542,73 @@ msgstr "新密码必须小于%d个字符长。"
 msgid "The new password entries mismatch."
 msgstr "新的密码输入不匹配。"
 
-#: src/gui/charcreatedialog.cpp:59
-msgid "Create Character"
-msgstr "创建角色"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:85 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "姓名"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:88 src/gui/charcreatedialog.cpp:93
-#: src/gui/charcreatedialog.cpp:99 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:91 src/gui/charcreatedialog.cpp:94
-#: src/gui/charcreatedialog.cpp:100 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr "头发颜色："
 
-#: src/gui/charcreatedialog.cpp:95
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:101
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:104 src/gui/charselectdialog.cpp:483
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
 #: src/gui/socialwindow.cpp:1260
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:106 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:107 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:125 src/gui/charcreatedialog.cpp:312
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
-#: src/gui/charcreatedialog.cpp:231
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/charcreatedialog.cpp:317
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -645,9 +650,9 @@ msgstr "删除字符输入的密码"
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:244 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
 
@@ -722,7 +727,7 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:222
+#: src/gui/setup_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
 #: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
@@ -734,12 +739,12 @@ msgstr "？？？"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:650
+#: src/gui/chatwindow.cpp:653
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1037
+#: src/gui/chatwindow.cpp:1040
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -904,7 +909,7 @@ msgstr "你知道吗？"
 
 #: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
+#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
@@ -920,11 +925,36 @@ msgstr "下一页>"
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "确定"
 
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "端口："
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr "服务器类型："
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装备"
@@ -1022,39 +1052,39 @@ msgstr "取回"
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr "添加到购买商店。"
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr "添加到出售商店。"
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr "未知。"
 
@@ -1169,32 +1199,31 @@ msgstr "自动关闭"
 msgid "Skip"
 msgstr "跳过"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
 msgid "Login"
 msgstr "登录"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "服务器："
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:97
 msgid "Custom update host"
 msgstr "自定义更新主机"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Remember username"
 msgstr "记住用户名"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Update:"
 msgstr "更新日期："
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "注册"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:123
 msgid "Change Server"
 msgstr "更改服务器"
 
@@ -1271,12 +1300,12 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
 #: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
@@ -1682,64 +1711,58 @@ msgstr "密码不能少于%d个字符。"
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "端口："
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr "服务器类型："
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr "负载"
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr "连接"
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr "自定义服务器"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "添加"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "请输入服务器的IP地址和端口"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
+#: src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr "编辑"
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:448
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:453
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:457
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:461
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:681
+#: src/gui/serverdialog.cpp:545
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:683
+#: src/gui/serverdialog.cpp:547
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -2303,23 +2326,23 @@ msgstr ""
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:240
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "旧"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:272
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -2447,8 +2470,8 @@ msgstr "字体大小"
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:628
+#: src/gui/setup_video.cpp:633
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
@@ -2500,148 +2523,147 @@ msgstr "中"
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:288
+#: src/gui/setup_video.cpp:289
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:290
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:292
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:293
+#: src/gui/setup_video.cpp:294
 msgid "Show pickup notification"
 msgstr "显示拾起通知"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
+#: src/gui/setup_video.cpp:296
 msgid "in chat"
 msgstr "聊天中"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
+#: src/gui/setup_video.cpp:298
 msgid "as particle"
 msgstr "作为发射武器"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:300
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:304
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:308 src/gui/setup_video.cpp:343
+#: src/gui/setup_video.cpp:568 src/gui/setup_video.cpp:722
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
+#: src/gui/setup_video.cpp:323
 msgid "Overhead text"
 msgstr "头顶文字"
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_video.cpp:324
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:323
+#: src/gui/setup_video.cpp:325
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:324
+#: src/gui/setup_video.cpp:326
 msgid "Particle detail"
 msgstr "l"
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:341 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:567 src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:720
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:489
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:495
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:506
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:507
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:519
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:520
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:610
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:611
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:627 src/gui/setup_video.cpp:632
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:630
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
+#: src/gui/setup_video.cpp:666
 msgid "Particle Effect Settings Changed."
 msgstr "粒子效果更改的设置。"
 
-#: src/gui/setup_video.cpp:655
+#: src/gui/setup_video.cpp:667
 msgid "Changes will take effect on map change."
 msgstr "变更会在地图更换时生效。"
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr "个人商店"
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr "购买物品"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr "出售物品"
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "添加"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr "公布"
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr "拍卖"
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
@@ -3244,23 +3266,23 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:90 src/gui/whoisonline.cpp:572
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
-#: src/gui/whoisonline.cpp:113
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr "更新"
 
-#: src/gui/whoisonline.cpp:196
+#: src/gui/whoisonline.cpp:194
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:586
+#: src/gui/whoisonline.cpp:622
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:625
+#: src/gui/whoisonline.cpp:661
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -3399,10 +3421,6 @@ msgstr "/leave > "
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick >"
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr "编辑"
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > "
@@ -3653,7 +3671,7 @@ msgstr "项目的快捷键"
 #: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
 #: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
 #: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:371
+#: src/keyboardconfig.cpp:379
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品快捷 %d"
@@ -3780,517 +3798,519 @@ msgstr "笑脸"
 #: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
 #: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
 #: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:366
+#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
+#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
+#: src/keyboardconfig.cpp:374
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快捷键为 %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:278
 msgid "Outfits Keys"
 msgstr "套装按键"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:279
 msgid "Wear Outfit"
 msgstr "装备套装"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:281
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:283
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:285
 msgid "Chat Keys"
 msgstr "聊天按键"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:286
 msgid "Toggle Chat"
 msgstr "切换聊天"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:288
 msgid "Scroll Chat Up"
 msgstr "向上滚动聊天记录"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Down"
 msgstr "向下滚动聊天记录"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:292
 msgid "Previous Chat Tab"
 msgstr "上一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:294
 msgid "Next Chat Tab"
 msgstr "下一个聊天窗口标签页"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:297
 msgid "Close current Chat Tab"
 msgstr "关闭当前聊天标签"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:299
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:301
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:303
 msgid "Chat Auto Complete"
 msgstr "自动完成交谈"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:305
 msgid "Deactivate Chat Input"
 msgstr "停用聊天输入"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:307
 msgid "Other Keys"
 msgstr "其他按键"
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:308
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:312
 msgid "Direct Up"
 msgstr "直接向上"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:313
 msgid "Direct Down"
 msgstr "直接下"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:315
 msgid "Direct Left"
 msgstr "直接离开"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:316
 msgid "Direct Right"
 msgstr "直接对"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:318
 msgid "Crazy moves"
 msgstr "疯狂移动"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:320
 msgid "Change Crazy Move mode"
 msgstr "更改疯狂移动模式"
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:322
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items"
 msgstr "快速下降序号项目"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:326
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:328
 msgid "Quick heal target or self"
 msgstr "快速愈合的目标或自我"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:330
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:332
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:334
 msgid "Switch magic attack"
 msgstr "切换魔法攻击"
 
-#: src/keyboardconfig.cpp:329
+#: src/keyboardconfig.cpp:337
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:338
 msgid "Change move type"
 msgstr "更改移动类型"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:340
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:344
 msgid "Change Follow mode"
 msgstr "更改跟随模式"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:346
 msgid "Change Imitation mode"
 msgstr "更改仿模式"
 
-#: src/keyboardconfig.cpp:341
+#: src/keyboardconfig.cpp:349
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:350
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:352
 msgid "Enable / Disable away mode"
 msgstr "启用/禁用离开模式"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:354
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟右键单击"
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:356
 msgid "Toggle camera mode"
 msgstr "切换模式"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:358
 msgid "Modifier key"
 msgstr "修改按键"
 
-#: src/keyboardconfig.cpp:429
+#: src/keyboardconfig.cpp:437
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:384
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1440
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1443
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1446
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1449
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1452
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1454
+#: src/localplayer.cpp:1455
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1457
+#: src/localplayer.cpp:1458
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1481
+#: src/localplayer.cpp:1482
 #, 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:1898
+#: src/localplayer.cpp:1902
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1899
+#: src/localplayer.cpp:1903
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1900
+#: src/localplayer.cpp:1904
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1901
+#: src/localplayer.cpp:1905
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1906
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1907
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1930
+#: src/localplayer.cpp:1934
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1938
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1956
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1957
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1958
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1959
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1960
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1975
+#: src/localplayer.cpp:1979
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1976
+#: src/localplayer.cpp:1980
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1977
+#: src/localplayer.cpp:1981
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1978
+#: src/localplayer.cpp:1982
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1983
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1998 src/localplayer.cpp:2002 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:1999 src/localplayer.cpp:2021
+#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2000
+#: src/localplayer.cpp:2004
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2001
+#: src/localplayer.cpp:2005
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2022
+#: src/localplayer.cpp:2026
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2023
+#: src/localplayer.cpp:2027
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2024
+#: src/localplayer.cpp:2028
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2061
+#: src/localplayer.cpp:2065
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2066
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2067
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2068
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2069
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2079
+#: src/localplayer.cpp:2083
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2080
+#: src/localplayer.cpp:2084
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2081
+#: src/localplayer.cpp:2085
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2086
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2087
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2103
+#: src/localplayer.cpp:2107
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2108
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2109
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2110
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2111
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2126
+#: src/localplayer.cpp:2130
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2127
+#: src/localplayer.cpp:2131
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2132
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2133
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2134
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2149
+#: src/localplayer.cpp:2153
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2150
+#: src/localplayer.cpp:2154
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2151
+#: src/localplayer.cpp:2155
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2179
+#: src/localplayer.cpp:2183
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2198
+#: src/localplayer.cpp:2202
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2199
+#: src/localplayer.cpp:2203
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2200 src/localplayer.cpp:2215
+#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2213
+#: src/localplayer.cpp:2217
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2214
+#: src/localplayer.cpp:2218
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2239
+#: src/localplayer.cpp:2243
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2244
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2245
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3758
+#: src/localplayer.cpp:3763
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
+#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3767
+#: src/localplayer.cpp:3772
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
+#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4125
+#: src/localplayer.cpp:4130
 msgid "You see "
 msgstr "你看"
author	Andrei Karas <akaras@inbox.ru>	2012-02-02 16:52:56 +0300
committer	Andrei Karas <akaras@inbox.ru>	2012-02-02 16:52:56 +0300
commit	25a203cc7117ab67d3809f24b5fdd23a3653ef99 (patch)
tree	c1fdaf9e8f8672a9d2c30ce9ccec6fa435baecc2 /po
parent	e2742faa6506472af481ff58a35a0610ee7d4edd (diff)
download	plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.tar.gz plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.tar.bz2 plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.tar.xz plus-25a203cc7117ab67d3809f24b5fdd23a3653ef99.zip